diff options
| author | Karl Berry <karl@freefriends.org> | 2019-02-19 22:18:42 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2019-02-19 22:18:42 +0000 |
| commit | 549c5b5143e9ae63dbce060b6460b8e0995d7dc8 (patch) | |
| tree | 00484d7343831b8e7bbac245a5a12d643225030d /Master | |
| parent | 6b4f5bdb09d9da774f715d9d66bb900c0db73ab8 (diff) | |
pst-marble (19feb19)
git-svn-id: svn://tug.org/texlive/trunk@50060 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
27 files changed, 1112 insertions, 555 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-marble/CHANGES.md b/Master/texmf-dist/doc/generic/pst-marble/CHANGES.md index 2274dbd7bfc..34d153ab951 100644 --- a/Master/texmf-dist/doc/generic/pst-marble/CHANGES.md +++ b/Master/texmf-dist/doc/generic/pst-marble/CHANGES.md @@ -1,6 +1,6 @@ # **CHANGES** # -# pst-marble v. 1.2 # -# 2019/02/01 # +# pst-marble v. 1.3 # +# 2019/02/18 # Source: pst-marble.tex, pst-marble.sty, pst-marble.pro Author: Aubrey Jaffer @@ -131,6 +131,8 @@ this system has an extra degree of freedom. If you want to reduce the width of the affected region of a rake by a factor of 10, either reduce **V** by a factor of 10 or reduce **D** by a factor of 3.1 (sqrt 10). +--- + ## Changes in v. 1.1: ## Customer friendly setup of the actions. @@ -199,6 +201,8 @@ They are available for these following actions as well: and automatically detected. +--- + ## Changes in v. 1.2: The actions **arc-drops** and **spiral-drops** are erased and bundled together @@ -291,3 +295,36 @@ which are setup in parentheses and not square brackets. This is set to *Mathematical Marbling* by default to keep the drops to their initial randomly chosen places. Made for **Gaussian-drops** and **uniform-drops**. + +--- + +## Changes in v. 1.3: + +## **stroke** action + +now becomes **stylus** action, however **stroke** still can be used. + +## Rotations + +now are consistent. From vertical clockwise + +## New action **serpentine-drops** + +**serpentine-drops** deposits a series of drops on a user-specified *grid* +in a serpentine sequence. + +## New option **oversample** + +This option pixels the image. If taken *oversample=0* we get no-pixeled images. +If taken *oversample=1* we get the same as with *viscosity= negative* (v1.2) +which now is obsolete, but still works. +The smaller the *oversample* value is taken (between 0<*oversample*<1) the more +blocky the image gets rastered. + +## Transparency and Blendmodes + +A patch from **A. Grahn** now makes it possible to use these options the +*normal* PSTricks way and needn't be introduced within the **actions=\{...\}** +with raw PostScript code. Equal now for ps2pdf, xelatex and distiller. + +## Bug fixes diff --git a/Master/texmf-dist/doc/generic/pst-marble/README.md b/Master/texmf-dist/doc/generic/pst-marble/README.md index 2feb8753b57..92acc0be18d 100644 --- a/Master/texmf-dist/doc/generic/pst-marble/README.md +++ b/Master/texmf-dist/doc/generic/pst-marble/README.md @@ -1,6 +1,6 @@ # **README** # -# pst-marble v. 1.2 # -# 2019/02/01 # +# pst-marble v. 1.3 # +# 2019/02/18 # Source: pst-marble.tex, pst-marble.sty, pst-marble.pro Author: Aubrey Jaffer @@ -23,13 +23,14 @@ and itself) that has a continuous inverse function. The package comes with some predefined *basic actions* like: - drop -- arc-drops -- spiral-drops -- random-drops -- random-drops-colors +- line-drops +- serpentine-drops +- coil-drops +- Gaussian-drops +- uniform-drops - concentric-rings -- stroke - rake +- stylus - stir - vortex - wiggle diff --git a/Master/texmf-dist/doc/generic/pst-marble/examples/Bouquet.pdf b/Master/texmf-dist/doc/generic/pst-marble/examples/Bouquet.pdf Binary files differnew file mode 100644 index 00000000000..17570dc749e --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-marble/examples/Bouquet.pdf diff --git a/Master/texmf-dist/doc/generic/pst-marble/examples/Bouquet.tex b/Master/texmf-dist/doc/generic/pst-marble/examples/Bouquet.tex new file mode 100644 index 00000000000..ca1fcbba842 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-marble/examples/Bouquet.tex @@ -0,0 +1,30 @@ +\documentclass[pstricks]{standalone} +\usepackage{pst-marble} +\begin{document} +\begin{pspicture}(-6,-6)(6,6) + \psMarble[ + background={ + [1 1 1] + }, + colors={ + [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] + }, + viscosity=1000, + actions={ + 0 0 24 colors 36 concentric-rings + 180 [ 20 50 25 tines ] 40 200 31 rake + 0 350 shift + 0 270 0 -120 wiggle + 180 [ 3 600 -150 tines ] 40 200 31 rake + 0 270 0 240 wiggle + 180 [ 3 600 150 tines ] 40 200 31 rake + 0 270 0 -120 wiggle + } + ](12,12) +\end{pspicture} +\end{document} diff --git a/Master/texmf-dist/doc/generic/pst-marble/examples/Curl.pdf b/Master/texmf-dist/doc/generic/pst-marble/examples/Curl.pdf Binary files differnew file mode 100644 index 00000000000..fc7a78c8bd4 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-marble/examples/Curl.pdf diff --git a/Master/texmf-dist/doc/generic/pst-marble/examples/Curl.tex b/Master/texmf-dist/doc/generic/pst-marble/examples/Curl.tex new file mode 100644 index 00000000000..6269a00700f --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-marble/examples/Curl.tex @@ -0,0 +1,25 @@ +\documentclass[pstricks]{standalone} +\usepackage{pst-marble} +\begin{document} +\begin{pspicture}(-6,-6)(6,6) + \psMarble[ + background={ + [ 100 40 40 ] + }, + colors={ + [ 76 95 63 ] + [ 53 97 122 ] + [ 128 78 46 ] + }, + viscosity=-1000, + actions={ + 0 0 1100 1100 0 [ 222 186 149 ] 85 1.72 10 mul uniform-drops + 0 0 1100 1100 0 colors 250 1.72 16 mul uniform-drops + 0 0 1100 1100 0 [ 222 186 149 ] 100 1.72 7 mul uniform-drops + 0 0 [ 100 ] 40 300 31 stir + 0 0 [ 200 275 ] 20 120 10 stir + 0 0 [ 325 ] 20 90 31 stir + } + ](12,12) +\end{pspicture} +\end{document} diff --git a/Master/texmf-dist/doc/generic/pst-marble/examples/Latte.pdf b/Master/texmf-dist/doc/generic/pst-marble/examples/Latte.pdf Binary files differnew file mode 100644 index 00000000000..d49048234af --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-marble/examples/Latte.pdf diff --git a/Master/texmf-dist/doc/generic/pst-marble/examples/Latte.tex b/Master/texmf-dist/doc/generic/pst-marble/examples/Latte.tex new file mode 100644 index 00000000000..864a7b58676 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-marble/examples/Latte.tex @@ -0,0 +1,41 @@ +\documentclass[pstricks]{standalone} +\usepackage{pst-marble} +\begin{document} +\begin{pspicture}(-6,-6)(6,6) + \psMarble[ + background={ + [0.1 0 0.1] + }, + colors={ + (e7cc9b) + (c28847) + (80410b) + }, + viscosity=1000, + actions={ + %% coffee mug rim and stirred foam + 0 0 150 [ .8 .8 .7 ] drop + 0 0 150 [ .8 .9 .8 ] drop + 0 0 150 [ .9 .9 .8 ] drop + 0 0 500 colors 2 get drop + 0 0 283 0 1 colors 1 get 30 30 Gaussian-drops + 0 0 -50e3 100 vortex + %% tulip + 0 -250 55 colors 0 get drop + 0 -200 35 colors 2 get drop + 0 -150 55 colors 0 get drop + 0 -100 35 colors 2 get drop + 0 -50 55 colors 0 get drop + 0 75 0 -450 20 30 stylus + %% wreath + 0 10 390 90 95 0 colors 1 get 14 25 coil-drops + 0 0 400 90 100 0 colors 0 get 14 40 coil-drops + 0 0 [ -400 ] 1 20 31 stir + %% short vine + -100 250 75 [ 6 80 0 tines ] colors 1 get 20 line-drops + -100 250 75 [ 6 80 0 tines ] colors 0 get 30 line-drops + -300 200 300 350 20 30 stylus + } + ](12,12) +\end{pspicture} +\end{document} diff --git a/Master/texmf-dist/doc/generic/pst-marble/examples/Leaves.pdf b/Master/texmf-dist/doc/generic/pst-marble/examples/Leaves.pdf Binary files differnew file mode 100644 index 00000000000..451b4a2d241 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-marble/examples/Leaves.pdf diff --git a/Master/texmf-dist/doc/generic/pst-marble/examples/Leaves.tex b/Master/texmf-dist/doc/generic/pst-marble/examples/Leaves.tex new file mode 100644 index 00000000000..76fdc1b6c7c --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-marble/examples/Leaves.tex @@ -0,0 +1,24 @@ +\documentclass[pstricks]{standalone} +\usepackage{pst-marble} +\begin{document} +\begin{pspicture}(-3,-6)(3,6) + \psMarble[ + colors={ + [183 168 135] + [106 107 91] + }, + background={ + [100 100 85] + }, + viscosity=-1000, + actions={ + 0 0 500 1000 0 colors 0 get 125 34 uniform-drops + 90 [ 7 150 -75 tines ] 80 200 20 rake + -90 [ 7 150 0 tines ] 80 200 20 rake + 0 0 500 1000 0 colors 1 get 750 12 uniform-drops + 180 [ 3 256 0 tines ] 80 200 20 rake + 0 [ 3 256 -128 tines ] 80 200 20 rake + } + ](6,12) +\end{pspicture} +\end{document} diff --git a/Master/texmf-dist/doc/generic/pst-marble/examples/Nonpareil.pdf b/Master/texmf-dist/doc/generic/pst-marble/examples/Nonpareil.pdf Binary files differnew file mode 100644 index 00000000000..2959e6e44bf --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-marble/examples/Nonpareil.pdf diff --git a/Master/texmf-dist/doc/generic/pst-marble/examples/Nonpareil.tex b/Master/texmf-dist/doc/generic/pst-marble/examples/Nonpareil.tex new file mode 100644 index 00000000000..90be95c8ded --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-marble/examples/Nonpareil.tex @@ -0,0 +1,31 @@ +\documentclass[pstricks]{standalone} +\usepackage{pst-marble} +\begin{document} +\begin{pspicture}(-6,-6)(6,6) + \psMarble[ + 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 48 colors 25 concentric-rings + 90 [-150 450] 100 750 31 rake + -90 [-150 450] 100 750 31 rake + 180 [ 25 50 0 tines ] 30 200 31 rake + 0 230 shift + } + ](12,12) +\end{pspicture} +\end{document} diff --git a/Master/texmf-dist/doc/generic/pst-marble/examples/Wreath.pdf b/Master/texmf-dist/doc/generic/pst-marble/examples/Wreath.pdf Binary files differnew file mode 100644 index 00000000000..238d4a289ac --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-marble/examples/Wreath.pdf diff --git a/Master/texmf-dist/doc/generic/pst-marble/examples/Wreath.tex b/Master/texmf-dist/doc/generic/pst-marble/examples/Wreath.tex new file mode 100644 index 00000000000..d79020bca8d --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-marble/examples/Wreath.tex @@ -0,0 +1,22 @@ +\documentclass[pstricks]{standalone} +\usepackage{pst-marble} +\begin{document} +\begin{pspicture}(-6,-6)(6,6) + \psMarble[ + background={ + [ 222 186 149 ] + }, + viscosity=1000, + actions={ + -300 92 500 + { + 0 exch 90 [ 12 100 -100 tines ] [ 76 95 63 ] 45 line-drops + } for + 90 [ 9 220 0 tines ] 40 200 31 rake + -90 [ 9 220 -100 tines ] 40 200 31 rake + 0 0 [ -350 ] 30 30 15 stir + 0 0 [ -150 ] 60 30 15 stir + } + ](12,12) +\end{pspicture} +\end{document} diff --git a/Master/texmf-dist/doc/generic/pst-marble/examples/ex1.pdf b/Master/texmf-dist/doc/generic/pst-marble/examples/ex1.pdf Binary files differindex d463f746e22..19d59f3f89d 100644 --- a/Master/texmf-dist/doc/generic/pst-marble/examples/ex1.pdf +++ b/Master/texmf-dist/doc/generic/pst-marble/examples/ex1.pdf diff --git a/Master/texmf-dist/doc/generic/pst-marble/examples/ex2.pdf b/Master/texmf-dist/doc/generic/pst-marble/examples/ex2.pdf Binary files differindex 9864c4d0b0e..8fc019c3695 100644 --- a/Master/texmf-dist/doc/generic/pst-marble/examples/ex2.pdf +++ b/Master/texmf-dist/doc/generic/pst-marble/examples/ex2.pdf diff --git a/Master/texmf-dist/doc/generic/pst-marble/examples/ex3.pdf b/Master/texmf-dist/doc/generic/pst-marble/examples/ex3.pdf Binary files differindex cbe6a62c06b..b9439920c5a 100644 --- a/Master/texmf-dist/doc/generic/pst-marble/examples/ex3.pdf +++ b/Master/texmf-dist/doc/generic/pst-marble/examples/ex3.pdf diff --git a/Master/texmf-dist/doc/generic/pst-marble/examples/ex3.tex b/Master/texmf-dist/doc/generic/pst-marble/examples/ex3.tex index 54afca3036a..82b7fed2028 100644 --- a/Master/texmf-dist/doc/generic/pst-marble/examples/ex3.tex +++ b/Master/texmf-dist/doc/generic/pst-marble/examples/ex3.tex @@ -16,4 +16,3 @@ }](10,10) \end{pspicture} \end{document} -0 0 100 0 [0 0 1] 40 30 Gaussian-drops
\ No newline at end of file diff --git a/Master/texmf-dist/doc/generic/pst-marble/examples/ex4.pdf b/Master/texmf-dist/doc/generic/pst-marble/examples/ex4.pdf Binary files differindex ffa093d7922..e635cd74761 100644 --- a/Master/texmf-dist/doc/generic/pst-marble/examples/ex4.pdf +++ b/Master/texmf-dist/doc/generic/pst-marble/examples/ex4.pdf diff --git a/Master/texmf-dist/doc/generic/pst-marble/examples/ex5.pdf b/Master/texmf-dist/doc/generic/pst-marble/examples/ex5.pdf Binary files differindex 7b13d7c038b..3528690d84f 100644 --- a/Master/texmf-dist/doc/generic/pst-marble/examples/ex5.pdf +++ b/Master/texmf-dist/doc/generic/pst-marble/examples/ex5.pdf diff --git a/Master/texmf-dist/doc/generic/pst-marble/pst-marble-commands.pdf b/Master/texmf-dist/doc/generic/pst-marble/pst-marble-commands.pdf Binary files differnew file mode 100644 index 00000000000..f6c2e370a1f --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-marble/pst-marble-commands.pdf diff --git a/Master/texmf-dist/doc/generic/pst-marble/pst-marble-commands.tex b/Master/texmf-dist/doc/generic/pst-marble/pst-marble-commands.tex new file mode 100644 index 00000000000..429780a9a71 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-marble/pst-marble-commands.tex @@ -0,0 +1,157 @@ +% pdflatex -interaction nonstopmode pst-marble-commands.tex +\documentclass{article} +\usepackage[margin=1cm]{geometry} +\usepackage{xcolor} +\usepackage{hyperref} + +%\documentclass[% +% 11pt, +% english, +% BCOR10mm, +% DIV12, +% bibliography=totoc, +% parskip=false, +% fleqn, +% smallheadings, +% headexclude, +% footexclude, +% oneside, +% dvipsnames, +% svgnames, +% x11names, +%]{pst-doc} + +\pagestyle{empty} + +\newcommand\myMarble[2]{% + \smallskip + \qquad {#1} \texttt{#2} +} + +\definecolor{Mycolor2}{HTML}{008000} +\newcommand\rgb{\textit{\textcolor{red}{r}\textcolor{Mycolor2}{g}\textcolor{blue}{b}} +} +\newcommand\rgbs{\texttt{[}\rgb~...\texttt{]} } +\newcommand\Rs{\texttt{[}$R$~...\texttt{]} } + +%% \parskip5pt +\parindent0pt + +\begin{document} + +\section*{PST-marble Commands} + +\url{http://people.csail.mit.edu/jaffer/Marbling/pst-marble-commands.pdf} + +\subsection*{Colors} + +RGB colors can be specified in three formats: + +\myMarble{\texttt{[ 0.906 0.8 0.608 ]}}{} + +Red, green, and blue color components between 0 and 1 in square +brackets. + +\myMarble{\texttt{[ 231 204 155 ]}}{} + +Red, green, and blue color components between 0 and 255 in square +brackets. + +\myMarble{\texttt{(e7cc9b)}}{} + +Red, green, and blue +(\textcolor{red}{Rr}\textcolor{Mycolor2}{Gg}\textcolor{blue}{Bb}) +hexadecimal color components between \texttt{00} and \texttt{FF} (or +\texttt{ff}) in parentheses. + +In the command arguments \rgbs indicates a +bracketed sequence of colors. For example: + +\myMarble{\texttt{[(c28847) [231 204 155] [0.635 0.008 0.094]]}}{} + + +\subsection*{Dropping Paint} + +\myMarble{$x$ $y$ $R_d$ \rgb}{drop} + +Places a drop of color \rgb and radius $R_d$ centered at location +$x,y$. + +\myMarble{$x$ $y$ $R_i$ \rgbs $n$}{concentric-rings} + +Places $n$ rings in color sequence \rgbs centered at location $x,y$, +each ring having thickness $R_i$. + +\myMarble{$x$ $y$ $\theta$ \Rs \rgbs $R_d$}{line-drops} + +Places drops of colors \rgbs (in sequence) of radius $R_d$ in +a line through $x,y$ at $\theta$ degrees clockwise from vertical +at distances \Rs from $x,y$. + +\myMarble{$x$ $y$ $R$ $\theta$ $S$ $\delta$ \rgbs $n$ $R_d$}{coil-drops} + +Places $n$ drops of colors \rgbs (in sequence) of radius +$R_d$ in an arc or spiral centered at $x,y$ starting at radius $R$ +and $\theta$ degrees clockwise from vertical, +moving $S$ along the arc and incrementing the arc radius +by $\delta$ after each drop. + +\myMarble{$x$ $y$ $R$ $\theta$ $\epsilon$ \rgbs $n$ $R_d$}{Gaussian-drops} + +Places $n$ drops of colors \rgbs of radius $R_d$ randomly in a +circular or elliptical disk centered at $x,y$ having mean radius $R$, +$\theta$ degrees clockwise from vertical, and length-to-width ratio +$\epsilon$. For a circular disk, 63\,\% of drops are within radius +$R$, 87\,\% of drops are within $R\,\sqrt{2}$, and 98\,\% of drops are +within radius $2\,R$. + +\myMarble{$x$ $y$ $L_x$ $L_y$ $\theta$ \rgbs $n$ $R_d$}{uniform-drops} + +Places $n$ drops of colors \rgbs of radius $R_d$ randomly in a $L_x$ +by $L_y$ rectangle centered at location $x,y$ and rotated by $\theta$ +degrees clockwise from vertical. + +\subsection*{Deformations} + +\myMarble{$\theta$ \Rs $V$ $S$ $D$}{rake} + +Pulls tines of diameter $D$ at $\theta$ degrees from the y-axis +through the virtual tank at velocity $V$, moving fluid on the tine +path a distance $S$. The tine paths are spaced \Rs from the tank +center at their nearest points. + +\myMarble{$x_b$ $y_b$ $x_e$ $y_e$ $V$ $D$}{stylus} + +Pulls a single tine of diameter $D$ from $x_b,y_b$ to $x_e,y_e$ at +velocity $V$. Legacy \texttt{stroke} also works. + +\myMarble{$x$ $y$ \Rs $\omega$ $\theta$ $D$}{stir} + +Pulls tines of diameter $D$ in circular tracks of radii \Rs (negative +$R$ is counterclockwise) around location $x,y$ at angular velocity +$\omega$. The maximum angle through which fluid is moved is $\theta$ +degrees. + +\myMarble{$x$ $y$ $\Gamma$ $t$}{vortex} + +Rotates fluid clockwise around location $x,y$ as would result from an +impulse of circulation $\Gamma$ after time $t$. At small $t$ the +rotational shear is concentrated close to the center. As time passes +the shear propagates outward. + +\myMarble{$\theta$ $\lambda$ $\Omega$ $S$}{wiggle} + +Applies sinsusoidal wiggle with period $\lambda$ and maximum +displacement $S$ to whole tank. With $\theta=0$, a point at $x,y$ is +moved to $x+S\,\sin(360\,y/\lambda+\Omega),y$. + +\myMarble{$\theta$ $R$}{shift} + +Shifts tank by $R$ at $\theta$ degrees clockwise from vertical. + +\myMarble{\texttt{[} $n$ $S$ $\Omega$}{tines} \texttt{]} + +The tines command and its arguments are replaced by a sequence of $n$ +numbers. The difference between adjacent numbers is $S$ and the center +number is $\Omega$ when $n$ is odd and $S/2-\Omega$ when $n$ is even. +\end{document} diff --git a/Master/texmf-dist/doc/generic/pst-marble/pst-marble-doc.pdf b/Master/texmf-dist/doc/generic/pst-marble/pst-marble-doc.pdf Binary files differindex 65afcdf9fef..5a61d79fedb 100644 --- a/Master/texmf-dist/doc/generic/pst-marble/pst-marble-doc.pdf +++ b/Master/texmf-dist/doc/generic/pst-marble/pst-marble-doc.pdf diff --git a/Master/texmf-dist/doc/generic/pst-marble/pst-marble-doc.tex b/Master/texmf-dist/doc/generic/pst-marble/pst-marble-doc.tex index 290f3e47d92..6d35bebb875 100644 --- a/Master/texmf-dist/doc/generic/pst-marble/pst-marble-doc.tex +++ b/Master/texmf-dist/doc/generic/pst-marble/pst-marble-doc.tex @@ -38,6 +38,7 @@ dvipsnames, svgnames, x11names, + distiller ]{pst-doc} \usepackage[autostyle]{csquotes} @@ -54,7 +55,7 @@ \begin{document} -\title{pst-marble v 1.2} +\title{pst-marble v 1.3} \subtitle{A PSTricks package to draw marble-like patterns} \author{% Aubrey \textsc{Jaffer}\\ @@ -74,27 +75,34 @@ \begin{abstract}\parskip4pt\parindent0pt -Marbling originated in Asia as a decorative art more than 800 years ago and spread to Europe in the 1500s where it was used for endpapers and book covers. +Marbling originated in Asia as a decorative art more than 800 years ago and spread to Europe in the 1500s where it was used for end-papers and book covers. The mathematical fascination with paint marbling is that while rakings across the tank stretch and deform the paint boundaries, they do not break or change the topology of the surface. With mechanical guides, a raking can be undone by reversing the motion of the rake to its original position. Raking is thus a physical manifestation of a homeomorphism, a continuous function between topological spaces (in this case between a topological space and itself) that has a continuous inverse function. \begin{center} \begin{pspicture}(-8,-6)(6,6) -\psMarble[background={[1 1 1]}, + \psMarble[ + background={ + [1 1 1] + }, colors={ - [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.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] }, + viscosity=1000, actions={ 0 0 24 colors 36 concentric-rings - 0 350 shift 180 [ 20 50 25 tines ] 40 200 31 rake - 90 270 0 -120 wiggle + 0 350 shift + 0 270 0 -120 wiggle 180 [ 3 600 -150 tines ] 40 200 31 rake - 90 270 0 240 wiggle + 0 270 0 240 wiggle 180 [ 3 600 150 tines ] 40 200 31 rake - 90 270 0 -120 wiggle + 0 270 0 -120 wiggle } ](12,12) \psframe(-8,-6)(6,6) @@ -103,7 +111,7 @@ The mathematical fascination with paint marbling is that while rakings across th \end{center} {\tiny\begin{verbatim} \begin{pspicture}(-8,-6)(6,6) -\psMarble[background={[1 1 1]}, + \psMarble[background={[1 1 1]}, colors={ [0.176 0.353 0.129][0.635 0.008 0.094] [0.078 0.165 0.518][0.824 0.592 0.031] @@ -111,13 +119,13 @@ The mathematical fascination with paint marbling is that while rakings across th }, actions={ 0 0 24 colors 36 concentric-rings - 0 350 shift 180 [ 20 50 25 tines ] 40 200 31 rake - 90 270 0 -120 wiggle + 0 350 shift + 0 270 0 -120 wiggle 180 [ 3 600 -150 tines ] 40 200 31 rake - 90 270 0 240 wiggle + 0 270 0 240 wiggle 180 [ 3 600 150 tines ] 40 200 31 rake - 90 270 0 -120 wiggle + 0 270 0 -120 wiggle } ](12,12) \psframe(-8,-6)(6,6) @@ -149,7 +157,7 @@ The mathematical fascination with paint marbling is that while rakings across th Aubrey Jaffer's article on the physical and mathematical interpretation of the formation of various types of marbling: \begin{center} -\url{https://arxiv.org/abs/1810.04646} +\url{https://arxiv.org/abs/1702.02106} \end{center} Aubrey Jaffer has improved the model shown in the previous version of \texttt{pst-marble}. Now it is closer to reality and more consistent in the choice of units. This version allows to perform more accurate simulations, however with some new parameters, which will be explained. @@ -176,13 +184,13 @@ Compared to the previous version, Aubrey Jaffer has reviewed some parameters: \texttt{vortex} now models a Lamb-Oseen vortex. We'll refer to the article he wrote to study the theory: \begin{center} -\url{http://people.csail.mit.edu/jaffer/Marbling/vortex.pdf} +\url{https://arxiv.org/abs/1810.04646} \end{center} The documentation illustrates the parameters that are now used: Center coordinates in mm, circulation in $\mathrm{mm^2/s}$ and time in s. -The primitive \texttt{line} has now become \texttt{rake} and allows to represent the obtained image when the artist equips himself with a comb (rake) comprising a certain number of identical teeth of a given diameter. He places the comb perpendicularly to a direction fixed by the angle made with the $Oy$-axis (the angle is positive clockwise) and moves it with a speed of (\texttt{V}) along the indicated direction or contrary to it, depending on the sign of the parameter \texttt{tU}. The positions of the teeth are fixed by the distances (in mm) indicated within the list [between the brackets]---the comb/rake can also comprise only one tooth. +The primitive \texttt{line} has now become \texttt{rake} and allows to represent the obtained image when the artist equips himself with a comb (rake) having a certain number of identical teeth of a given diameter. He places the comb perpendicularly to a direction fixed by the angle made with the $y$-axis (the angle is positive clockwise) and moves it with a speed of (\texttt{V}) along the indicated direction or contrary to it, depending on the sign of the parameter \texttt{tU}. The positions of the teeth are fixed by the distances (in mm) indicated within the list [between the brackets]---the comb/rake can also have only one tooth. By default, the tank's dimensions are 1 m $\times$ 1 m. The scaling factor of the image is 0.1. All lengths are in mm, velocities (in mm/s), angles (in degrees), angular velocity (in degrees/s), and viscosity and circulation (in $\mathrm{mm^2/s}$). @@ -192,16 +200,17 @@ Aubrey Jaffer retains 1 global parameter: the dynamic viscosity, see in particul \begin{center} \url{https://arxiv.org/abs/1702.02106} \end{center} -There are 12 types of actions defined and ready to use: +There are 13 types of actions defined and ready to use: \begin{verbatim} drop line-drops + serpentine-drops coil-drops Gaussian-drops uniform-drops concentric-rings rake - stroke + stylus stir vortex wiggle @@ -211,14 +220,13 @@ They make it possible to create a very large variety of marblings with combinati Initially there are drops of colors that the artist spreads with a brush on the surface (a bit of a hazard, even if they are located in a given region) and whose size depends on the brush. He performs the operation several times with other colors and also brushes of different sizes. These single drops, circular in shape, are placed with the following command \begin{verbatim} - cx cy r [rgb] 0 0 100 [0 0 1] drop \end{verbatim} Note, that the coordinates (\texttt{cx, cy}) of the center of the drop and its radius \texttt{r} are in points, the colors need to be setup in the rgb-color-system: (values between 0 and 1). Details are given in the following sections. So this is the first phase: arrange the drops on the surface in several stages with different radii and colors. To facilitate the experimentation of different types of actions, Aubrey Jaffer imagined an initial background obtained by dropping (one after the other) drops of different colors (we can also differentiate their radii) at the same point, they all have the same center, we then obtain an initial background consisting of concentric rings, named ``concentric-rings''. -Aubrey Jaffer coded all the possible simulations with the expected deformations (rake, stroke, stir, wiggle, vortex) in pure PostScript and his new code, perfectly structured, and whose use is very simple, would be enough to itself, if it weren't necessary for each test, to add lines, delete others, save them within the original PostScript file \ldots +Aubrey Jaffer coded all the possible simulations with the expected deformations (rake, stylus, stir, wiggle, vortex) in pure PostScript and his new code, perfectly structured, and whose use is very simple, would be enough to itself, if it weren't necessary for each test, to add lines, delete others, save them within the original PostScript file \ldots -Therefore, Manuel Luque and Jürgen Gilg have decided to adapt that into PSTricks (with the agreement of Aubey Jaffer). A \verb+\psMarble+ command to switch easily between the different types of actions and add a global viscosity parameter to the PostScript code. There are two ways to calculate and represent the drops. +Therefore, Manuel Luque and Jürgen Gilg have decided to adapt that into PSTricks (with the agreement of Aubrey Jaffer). A \verb+\psMarble+ command to switch easily between the different types of actions and add a global viscosity parameter to the PostScript code. There are two ways to calculate and represent the drops. \begin{itemize} \item We are interested only in their contour whose transformation is calculated after each addition of a new drop and whose interior is colored with its color (each drop retains its color); \item in the second case we consider the surface as a grid of points (square pixels of side 1 pt) and each drop is represented by the points situated between its edges. @@ -272,8 +280,7 @@ The first drop of paint placed within water forms a circle with the area $a$. If \end{center} The command to drop a drop is written as follows: \begin{verbatim} - cx cy r r g b - 0 0 100 [0 0 1] drop + 0 0 100 [0 0 1] drop \end{verbatim} Note that the coordinates of the center of the drop and its radius are in points\footnote {There is a scaling. Example: if the largest dimension of the page is 4, 100 pts will be represented 0.4 cm} and its color is in the system rgb: (values between 0 and 1). @@ -426,7 +433,7 @@ The boundaries between virtual paint rings will be traversed using the Minsky ci \Lcs{psMarble}\OptArgs\Largr{x , y} \end{BDef} -The command \Lcs{psMarble} contains the options \nxLkeyword{actions=}, \nxLkeyword{background=}, \nxLkeyword{seed=}, \nxLkeyword{bckg=true/false}, \nxLkeyword{viscosity=}, \nxLkeyword{drawcontours=true/false} and \nxLkeyword{colors=}. +The command \Lcs{psMarble} contains the options \nxLkeyword{actions=}, \nxLkeyword{background=}, \nxLkeyword{seed=}, \nxLkeyword{oversample=}, \nxLkeyword{bckg=true/false}, \nxLkeyword{viscosity=}, \nxLkeyword{drawcontours=true/false} and \nxLkeyword{colors=}. The optional argument \Largr{x , y} gives the \texttt{x} and \texttt{y} dimension of the image---the default is \Largr{10,10}. @@ -438,6 +445,7 @@ The optional argument \Largr{x , y} gives the \texttt{x} and \texttt{y} dimensio \Lkeyword{actions} & 0 0 35 colors 35 concentric-rings & The type of marbling action\\ \Lkeyword{background} & [0 0 0] & Background color to be used with rgb or RGB or hexadecimal notation\\ \Lkeyword{seed} & Mathematical Marbling & Random seed to obtain the same arrangement of random drops within \texttt{Gaussian-drops} and \texttt{uniform-drops}\\ +\Lkeyword{oversample} & 0 & Rendering option: the smaller the \texttt{oversample} value, the larger the pixels.\\ \Lkeyword{bckg} & true & Boolean: to turn on/off the background color\\ \Lkeyword{colors} & \parbox{5cm}{ [0.275 0.569 0.796] @@ -453,7 +461,7 @@ The optional argument \Largr{x , y} gives the \texttt{x} and \texttt{y} dimensio }% & Colors of the marbling can be set within the rgb-color-system or as hexadecimal color constants\\ \Lkeyword{drawcontours} & false & Boolean: if set to \texttt{true}, it only draws the contours\\ -\Lkeyword{viscosity} & 1000 & Global primitive: viscosity of the system---if taken negative pixeled image\\ +\Lkeyword{viscosity} & 1000 & Global primitive: viscosity of the system\\ \bottomrule \end{tabularx} \end{quote} @@ -463,15 +471,15 @@ The optional argument \Largr{x , y} gives the \texttt{x} and \texttt{y} dimensio \textbf{Notes:} \begin{itemize} -\item If \texttt{viscosity<0}, the image will be pixeled, if set to positive values it will be non-pixeled. -\item The boolean option \texttt{drawcontours} is by default set to \texttt{false}. If set to \texttt{true}, only the contours are drawn within the image. -\item Sometimes it is quite helpful to be able to turn off the background color. This can be handled with the boolean key \texttt{bckg}, which if set to \texttt{false} turns off the background color. -\item Colors can be setup within the rgb-color-system: \verb!colors={[0.1 0.4 0.9] [1 0 1] ... }! or \verb!colors={[255 0 0] [123 245 129] ... }!. As well can be entered hexadecimal color constants which are set up within parenthese like: \verb!colors={(e7cc9b) (c28847) (80410b) ... }! or with capital letters like: \verb!colors={(E7CC9B) (C28847) (80410B) ... }! +\item If \texttt{oversample>0}, the image will be pixeled. +\item The Boolean option \texttt{drawcontours} is by default set to \texttt{false}. If set to \texttt{true}, only the contours are drawn within the image. +\item Sometimes it is quite helpful to be able to turn off the background color. This can be handled with the Boolean key \texttt{bckg}, which if set to \texttt{false} turns off the background color. +\item Colors can be setup within the rgb-color-system: \verb!colors={[0.1 0.4 0.9] [1 0 1] ... }! or \verb!colors={[255 0 0] [123 245 129] ... }!. As well can be entered hexadecimal color constants which are set up within parentheses like: \verb!colors={(e7cc9b) (c28847) (80410b) ... }! or with capital letters like: \verb!colors={(E7CC9B) (C28847) (80410B) ... }! \item For the \texttt{background} color curly braces are needed: \texttt{background=\{[0.2 0.5 0.7]\}}\\ or \texttt{background=\{[2 255 2]\}}. -\item Following are introduced some basic actions, like \texttt{drop}, \texttt{line-drops}, \texttt{coil-drops}, \texttt{Gaussian-drops}, \texttt{uniform-drops}, \texttt{concentric-rings}, \texttt{rake}, \texttt{stroke}, \texttt{stir}, \texttt{vortex}, \texttt{wiggle} and \texttt{shift}. +\item Following are introduced some basic actions, like \texttt{drop}, \texttt{line-drops}, \texttt{serpentine-drops},\texttt{coil-drops}, \texttt{Gaussian-drops}, \texttt{uniform-drops}, \texttt{concentric-rings}, \texttt{rake}, \texttt{stylus}, \texttt{stir}, \texttt{vortex}, \texttt{wiggle} and \texttt{shift}. - Within the basic actions \texttt{stir} and \texttt{vortex}, there is defined each with a radius \texttt{r} parameter. If \texttt{r>0} is set, the deformation is counterclockwise, if set to positive values, the deformation is clockwise. + Within the basic actions \texttt{stir} and \texttt{vortex}, there is defined each with a radius \texttt{r} parameter. If \texttt{r<0} is set, the deformation is counterclockwise, if set to positive values, the deformation is clockwise. \end{itemize} @@ -480,32 +488,48 @@ or \texttt{background=\{[2 255 2]\}}. \section{Rendering} -As designs get more complicated, hundreds of drops and strokes, reverse-rendering is the only practical way to render them. As the number of strokes increases, the number of points in the contours needs to increase as well. As the number of drops increases, the time to compute each pixel becomes less than the time to compute each contour-point on the drops. +As designs get more complicated, hundreds of drops and styluses, reverse-rendering is the only practical way to render them. As the number of strokes increases, the number of points in the contours needs to increase as well. As the number of drops increases, the time to compute each pixel becomes less than the time to compute each contour-point on the drops. The reason that we don't always reverse-render is because its resolution is limited to the raster; forward-rendering designs remain crisp at any magnification. + +\subsection{\texttt{oversample}} + + \begin{itemize} -\item To use forward-rendering (pixelfree) we choose the option \texttt{viscosity>0} with a positive value. -\item To use reverse-rendering (pixeled) we choose the option \texttt{viscosity<0} with a negative value. When a new drop is placed, the points in that drop retain their color, the outer points are calculated before being assigned their initial color. This possibility is operational by taking for \texttt{viscosity} (characteristic constant) a negative value. +\item \texttt{oversample=0} is contour rendering (pixel-free). +\item \texttt{oversample>0} is raster rendering. +\item \texttt{oversample=0.5} is raster rendering at half resolution. It renders blocky images relatively quickly. +\item \texttt{oversample=1} is raster rendering; the same as negative \texttt{viscosity=} from v1.2. +\item \texttt{oversample>1} will take longer to render, the image produced by ghostscript will be no better than \texttt{oversample=1}. \end{itemize} +\textbf{Note:} The smaller the \texttt{oversample=} value, the more blocky the image gets. Typical values might be: 0, 0.5, 1. + + + +%\begin{itemize} +%\item To use forward-rendering (pixel-free) we choose the option \texttt{viscosity>0} with a positive value. +%\item To use reverse-rendering (pixeled) we choose the option \texttt{viscosity<0} with a negative value. When a new drop is placed, the points in that drop retain their color, the outer points are calculated before being assigned their initial color. This possibility is operational by taking for \texttt{viscosity} (characteristic constant) a negative value. +%\end{itemize} + \begin{minipage}[t]{6cm}\kern0pt \begin{pspicture}(-3,-3)(3,3) -\psMarble[viscosity=-1000](6,6) +\psMarble[oversample=0.4](6,6) \end{pspicture} {\small\begin{verbatim} \begin{pspicture}(-3,-3)(3,3) -\psMarble[viscosity=-1000](6,6) +\psMarble[oversample=0.4](6,6) \end{pspicture} \end{verbatim}} \end{minipage} \hfill \begin{minipage}[t]{6cm}\kern0pt \begin{pspicture}(-3,-3)(3,3) -\psMarble[viscosity=1000](6,6) +\psMarble[oversample=1](6,6) \end{pspicture} {\small\begin{verbatim} \begin{pspicture}(-3,-3)(3,3) -\psMarble[viscosity=1000](6,6) +\psMarble[oversample=1](6,6) \end{pspicture} \end{verbatim}} \end{minipage} @@ -651,7 +675,7 @@ actions={% xc yc ang [ r ] [ rgb ] drad line-drops \end{verbatim} -Drops color \texttt{[rgb]} or color series of radius \texttt{drad} in a line centered at \texttt{xc, yc }and \texttt{ang} degrees from vertical. One drop is placed at each \texttt{r} distance from \texttt{xc, yc}. +Drops color \texttt{[rgb]} or color series of radius \texttt{drad} in a line centered at \texttt{xc, yc }and \texttt{ang} degrees from vertical (clockwise). One drop is placed at each \texttt{r} distance from \texttt{xc, yc}. For [r] we can use \begin{verbatim} @@ -720,6 +744,116 @@ actions={ \newpage +\subsection{\texttt{serpentine-drops}} + +\texttt{serpentine-drops} deposits a series of drops on a + user-specified ``grid'' in a serpentine sequence. +\begin{verbatim} +xc yc [ x-places ] [ y-places ] ang rgb drad serpentine-drops + +xc, yc Coordinates of the center +[ x-places ] x-coordinates for the x times y number of drops +[ y-places ] y-coordinates for the x times y number of drops +ang Rotation angle from vertical (clockwise) +rgb Color of the drops or color series (array) +drad Radius of the drops +\end{verbatim} +Places drops of colors \texttt{[ rgb ]} of radius \texttt{drad} in a serpentine +pattern (starting lower left to right; right to left; left to right ...) +at coordinates \texttt{[ x-places ] x [ y-places ]} relative to +location \texttt{xc, yc} and rotated by \texttt{ang} degrees clockwise +from vertical. The sequences \texttt{[ x-places ]} and \texttt{[ y-places ]} +determine the order in which drops are placed. The resulting grid will not +be square because each drop is moved by subsequent drops. +\begin{center} +\begin{pspicture}(-5,-5)(5,5) +\psMarble[ +actions={% +0 0 [-200 -100 0 100 200][-200 0 200 ] 0 colors 20 serpentine-drops +} +](10,10) +\multido{\iA=-2+1}{5}{% +\psline[linecolor=red]{->}(\iA,-3.5)(\iA,-2.5) +} +\uput[-90](0,-3.5){\color{red}\texttt{x-places}} +\multido{\iA=-2+2}{3}{% +\psline[linecolor=red]{->}(3.5,\iA)(2.5,\iA) +} +\rput{90}(3.9,0){\color{red}\texttt{y-places}} +\uput[-90](0,-3.5){\color{red}\texttt{x-places}} +\psdot[linecolor=red](0,0) +\uput[-90](0,0){\color{red}\texttt{xc,yc}} +\psline[linecolor=blue,linestyle=dashed]{->}(-2,-1.5)(2,-1.5) +\psline[linecolor=blue,linestyle=dashed]{<-}(-2,0.5)(2,0.5) +\psline[linecolor=blue,linestyle=dashed]{->}(-2,2.5)(2,2.5) +\end{pspicture} +\end{center} +{\tiny\begin{verbatim} +\begin{pspicture}(-5,-5)(5,5) +\psMarble[ +actions={% +0 0 [-200 -100 0 100 200][-200 0 200 ] 0 colors 20 serpentine-drops +} +](10,10) +\multido{\iA=-2+1}{5}{% +\psline[linecolor=red]{->}(\iA,-3.5)(\iA,-2.5) +} +\uput[-90](0,-3.5){\color{red}\texttt{x-places}} +\multido{\iA=-2+2}{3}{% +\psline[linecolor=red]{->}(3.5,\iA)(2.5,\iA) +} +\rput{90}(3.9,0){\color{red}\texttt{y-places}} +\uput[-90](0,-3.5){\color{red}\texttt{x-places}} +\psdot[linecolor=red](0,0) +\uput[-90](0,0){\color{red}\texttt{xc,yc}} +\psline[linecolor=blue,linestyle=dashed]{->}(-2,-1.5)(2,-1.5) +\psline[linecolor=blue,linestyle=dashed]{<-}(-2,0.5)(2,0.5) +\psline[linecolor=blue,linestyle=dashed]{->}(-2,2.5)(2,2.5) +\end{pspicture} +\end{verbatim}} + + +\newpage + + +\begin{verbatim} +[ cnt spacing ofst tines ] +\end{verbatim} +Returns \texttt{cnt} numbers \texttt{spacing} apart with middle element equal to \texttt{ofst}. + +Used as well for the \texttt{rake} and \texttt{line-drops} command. + +\begin{center} +\begin{pspicture}(-5,-5)(5,5) +\psMarble[ +actions={% +0 0 [5 100 0 tines][6 75 20 tines] 30 colors 50 serpentine-drops +} +](10,10) +\psline[linecolor=red](0,0)(0,4) +\psline[linecolor=red](0,0)(4;60) +\psarcn[linecolor=red]{->}(0,0){3.7}{90}{60} +\uput{3.7}[75](0,0){\color{red}\texttt{ang}} +\end{pspicture} +\end{center} +\begin{verbatim} +\begin{pspicture}(-5,-5)(5,5) +\psMarble[ +actions={% +0 0 [5 100 0 tines][6 75 20 tines] 30 colors 50 serpentine-drops +} +](10,10) +\psline[linecolor=red](0,0)(0,4) +\psline[linecolor=red](0,0)(4;60) +\psarcn[linecolor=red]{->}(0,0){3.7}{90}{60} +\uput{3.7}[75](0,0){\color{red}\texttt{ang}} +\end{pspicture} +\end{verbatim} + + +\newpage + + \subsection{\texttt{coil-drops}} \texttt{coil-drops} defines a series of drops along a circle or spiral. @@ -728,7 +862,7 @@ xc yc r ang-strt arcinc rinc [rgb] cnt drad coil-drops xc, yc Coordinates of the center r Radius of the circle where the drops will lay on -ang-str Start angle from vertical: if 0 it starts North, if 90 it starts East, ... +ang-str Start angle from vertical (clockwise) arcinc Arc-length between the drops rinc Increment of r: if taken 0 it gives a circle, if taken >0 it spirals outwards, @@ -770,7 +904,7 @@ actions={ xc yc r ang eccentricity [ rgb ] cnt drad Gaussian-drops \end{verbatim} -Drops \texttt{cnt} paint drops with radius \texttt{drad} in normal (Gaussian) distribution centered at\texttt{ xc, yc} with radius \texttt{r}, \texttt{ang} degrees from vertical and length to width ratio \texttt{eccentricity} (1 is circular). +Drops \texttt{cnt} paint drops with radius \texttt{drad} in normal (Gaussian) distribution centered at\texttt{ xc, yc} with radius \texttt{r}, \texttt{ang} degrees from vertical (clockwise) and length to width ratio \texttt{eccentricity} (1 is circular). \texttt{[rgb]} can be one color or a color series. @@ -786,7 +920,7 @@ colors={ }, actions={ 200 0 100 0 1 colors 150 10 Gaussian-drops --300 0 100 -30 4 [190 195 9] 55 10 Gaussian-drops +-300 0 100 30 4 [190 195 9] 55 10 Gaussian-drops }] \pscircle[linecolor=red](2,0){!1}\pscircle[linecolor=red](2,0){!1 2 sqrt mul} \pscircle[linecolor=red](2,0){!1 2 mul} @@ -811,7 +945,7 @@ colors={ }, actions={ 200 0 100 0 1 colors 150 10 Gaussian-drops --300 0 100 -30 4 [190 195 9] 55 10 Gaussian-drops +-300 0 100 30 4 [190 195 9] 55 10 Gaussian-drops }] \pscircle[linecolor=red](2,0){!1}\pscircle[linecolor=red](2,0){!1 2 sqrt mul} \pscircle[linecolor=red](2,0){!1 2 mul} @@ -837,7 +971,7 @@ actions={ xc yc xsid ysid angle [ rgb ] cnt drad uniform-drops \end{verbatim} -Drops \texttt{cnt} paint drops with radius \texttt{drad} in a uniform distribution in a \texttt{xsid} by \texttt{ysid} box centered at \texttt{xc, yc} and rotated by \texttt{angle}. +Drops \texttt{cnt} paint drops with radius \texttt{drad} in a uniform distribution in a \texttt{xsid} by \texttt{ysid} box centered at \texttt{xc, yc} and rotated by \texttt{angle} from vertical (clockwise). \texttt{[rgb]} can be one color or a color series. \begin{center} @@ -850,7 +984,7 @@ actions={ 0 0 200 200 0 [[0.176 0.353 0.129][0.635 0.008 0.094][0.078 0.165 0.518]] 65 10 uniform-drops -300 -200 150 200 0 colors 4 get 25 12 uniform-drops 100 300 400 50 0 colors 3 get 30 8 uniform-drops --200 300 400 50 45 colors 5 get 30 8 uniform-drops +-200 300 50 400 45 colors 5 get 30 8 uniform-drops }] \rput(0,0){\psframe(-1,-1)(1,1)} \psline[linecolor=red]{|<->|}(-1,-1.2)(1,-1.2)\uput[-90](0,-1.2){\textcolor{red}{200}} @@ -877,7 +1011,7 @@ actions={ 0 0 200 200 0 [[0.176 0.353 0.129][0.635 0.008 0.094][0.078 0.165 0.518]] 65 10 uniform-drops -300 -200 150 200 0 colors 4 get 25 12 uniform-drops 100 300 400 50 0 colors 3 get 30 8 uniform-drops --200 300 400 50 45 colors 5 get 30 8 uniform-drops +-200 300 50 400 45 colors 5 get 30 8 uniform-drops }] \rput(0,0){\psframe(-1,-1)(1,1)} \psline[linecolor=red]{|<->|}(-1,-1.2)(1,-1.2)\uput[-90](0,-1.2){\textcolor{red}{200}} @@ -1047,7 +1181,7 @@ By default, the tank's dimensions are 1 m $\times$ 1 m. The scaling factor of th For a convex stylus or tine, \texttt{D} (in mm) is the ratio of its submerged volume to its wetted surface area. For a long cylinder it is its diameter. \begin{verbatim} -[ angle [ r ] V tU D /rake ] +angle [ r ] V tU D rake angle Angle from y-axis in degrees; 0 is up. - If angle positve: direction is north-east (>90 south-east). @@ -1155,7 +1289,7 @@ The stylus parameter \texttt{D} (given in mm) is the ratio of its submerged volu \psMarble[viscosity=1000,linewidth=0.1,bckg=false,drawcontours, colors={[0 0 0]}, actions={ -0 0 70 colors 26 concentric-rings +0 0 50 2 sqrt mul colors 9 concentric-rings % angle r V tU D 45 [200] 20 -100 50 rake }](10,10)% @@ -1165,7 +1299,7 @@ actions={ \uput{2.1}[67.5](0,0){$\alpha=45^{\mathrm{o}}$} \psline{->}(0,0)(!2 sqrt 2 sqrt neg) \uput[45](0.707,-0.707){$r>0$} -\rput(!2 sqrt 2 sqrt neg){\psline[linecolor=red,linewidth=0.1]{->}(0,0)(1;225)} +\rput(!2 sqrt 2 sqrt neg){\psline[linecolor=red,linewidth=0.1]{->}(0,0)(1.8;225)} \rput(0.6,-1.7){\red tU} \psgrid[subgriddiv=1,griddots=10,gridlabels=0pt] \end{pspicture*}} @@ -1175,7 +1309,7 @@ actions={ \psMarble[viscosity=1000,linewidth=0.1,bckg=false,drawcontours, colors={[0 0 0]}, actions={ -0 0 70 colors 26 concentric-rings +0 0 50 2 sqrt mul colors 9 concentric-rings % angle r V tU D 45 [200] 20 -100 50 rake }](10,10)% @@ -1185,7 +1319,7 @@ actions={ \uput{2.1}[67.5](0,0){$\alpha=45^{\mathrm{o}}$} \psline{->}(0,0)(!2 sqrt 2 sqrt neg) \uput[45](0.707,-0.707){$r>0$} -\rput(!2 sqrt 2 sqrt neg){\psline[linecolor=red,linewidth=0.1]{->}(0,0)(1;225)} +\rput(!2 sqrt 2 sqrt neg){\psline[linecolor=red,linewidth=0.1]{->}(0,0)(1.8;225)} \rput(0.6,-1.7){\red tU} \psgrid[subgriddiv=1,griddots=10,gridlabels=0pt] \end{pspicture*} @@ -1213,7 +1347,7 @@ The stylus parameter \texttt{D} (given in mm) is set to 50 mm. \psMarble[viscosity=1000,linewidth=0.1,bckg=false,drawcontours, colors={[0 0 0]}, actions={ -0 0 70 colors 26 concentric-rings +0 0 50 2 sqrt mul colors 9 concentric-rings % angle r V tU D 45 [200] 20 100 50 rake }](10,10)% @@ -1223,7 +1357,7 @@ actions={ \uput{2.1}[67.5](0,0){$\alpha=45^{\mathrm{o}}$} \psline{->}(0,0)(!2 sqrt 2 sqrt neg) \uput[45](0.707,-0.707){$r>0$} -\rput(!2 sqrt 2 sqrt neg){\psline[linecolor=red,linewidth=0.1]{->}(0,0)(1;45)} +\rput(!2 sqrt 2 sqrt neg){\psline[linecolor=red,linewidth=0.1]{->}(0,0)(1.8;45)} \rput(2.5,-0.9){\red tU} \psgrid[subgriddiv=1,griddots=10,gridlabels=0pt] \end{pspicture*}} @@ -1233,7 +1367,7 @@ actions={ \psMarble[viscosity=1000,linewidth=0.1,bckg=false,drawcontours, colors={[0 0 0]}, actions={ -0 0 70 colors 26 concentric-rings +0 0 50 2 sqrt mul colors 9 concentric-rings % angle r V tU D 45 [200] 20 100 50 rake }](10,10)% @@ -1243,7 +1377,7 @@ actions={ \uput{2.1}[67.5](0,0){$\alpha=45^{\mathrm{o}}$} \psline{->}(0,0)(!2 sqrt 2 sqrt neg) \uput[45](0.707,-0.707){$r>0$} -\rput(!2 sqrt 2 sqrt neg){\psline[linecolor=red,linewidth=0.1]{->}(0,0)(1;45)} +\rput(!2 sqrt 2 sqrt neg){\psline[linecolor=red,linewidth=0.1]{->}(0,0)(1.8;45)} \rput(2.5,-0.9){\red tU} \psgrid[subgriddiv=1,griddots=10,gridlabels=0pt] \end{pspicture*} @@ -1256,9 +1390,9 @@ actions={ \textbf{Example 3:} \verb+ 0 [11 100 0 tines] 50 100 30 rake+ \begin{verbatim} -cnt spacing ofst tines +[ cnt spacing ofst tines ] -cnt Number of theeth +cnt Number of teeth spacing Displacement between the teeth ofst Offset of the middle tooth to the left (negative), @@ -1347,15 +1481,15 @@ actions={% \newpage -\subsection{\texttt{stroke}} +\subsection{\texttt{stylus}} The documentation is on the web page: \begin{center} \url{http://people.csail.mit.edu/jaffer/Marbling/Mathematics} \end{center} -Parameters for \texttt{/stroke-deformation}: \texttt{bx, by, ex, ey, V, D} +Parameters for \texttt{/stylus}: \texttt{bx, by, ex, ey, V, D} \begin{verbatim} -bx by ex ey V D stroke +bx by ex ey V D stylus bx, by Beginning of stroke ex, ey End of stroke @@ -1371,7 +1505,7 @@ D Stylus diameter in mm. Make larger to affect paint farther away. actions={% 0 0 35 colors 32 concentric-rings % X1 begin Y1 begin X2 end Y2 end V D -30 sin 400 mul 30 cos 400 mul 30 sin 100 mul 30 cos 100 mul 50 10 stroke +30 sin 400 mul 30 cos 400 mul 30 sin 100 mul 30 cos 100 mul 50 10 stylus }](10,10) \psset{linecolor=red,linewidth=0.1} \pstVerb{/scaleFactor 10 1000 div def @@ -1387,7 +1521,7 @@ actions={% actions={% 0 0 35 colors 32 concentric-rings % X1 begin Y1 begin X2 end Y2 end V D -30 sin 400 mul 30 cos 400 mul 30 sin 100 mul 30 cos 100 mul 50 10 stroke +30 sin 400 mul 30 cos 400 mul 30 sin 100 mul 30 cos 100 mul 50 10 stylus }](10,10) \psset{linecolor=red,linewidth=0.1} \pstVerb{/scaleFactor 10 1000 div def @@ -1410,7 +1544,7 @@ actions={% actions={% 0 0 35 colors 32 concentric-rings % X1 begin Y1 begin X2 end Y2 end V D -30 sin 400 mul 30 cos 400 mul 30 sin 100 mul 30 cos 100 mul 200 30 stroke +30 sin 400 mul 30 cos 400 mul 30 sin 100 mul 30 cos 100 mul 200 30 stylus }](10,10) \psset{linecolor=red,linewidth=0.1} \pstVerb{/scaleFactor 10 1000 div def @@ -1429,7 +1563,7 @@ actions={% actions={% 0 0 35 colors 32 concentric-rings % X1 begin Y1 begin X2 end Y2 end V D -30 sin 400 mul 30 cos 400 mul 30 sin 100 mul 30 cos 100 mul 200 30 stroke +30 sin 400 mul 30 cos 400 mul 30 sin 100 mul 30 cos 100 mul 200 30 stylus }](10,10) \psset{linecolor=red,linewidth=0.1} \pstVerb{/scaleFactor 10 1000 div def @@ -1449,14 +1583,14 @@ actions={% \subsection{\texttt{stir}} -Consider a single stylus (a cylinder of diameter \texttt{D}) that is placed on the $Oy$-axis at a distance $r$ from the chosen center. In a circular motion, the artist rotates the stylus by an angle $\theta$. The angular velocity will influence the shape of the deformation. The direction of rotation is fixed by the sign of $\theta$. If $\theta>0$ the artist rotates counterclockwise \footnote{The sign of $r$ can also indicate the direction of rotation. If $r<0$ the direction of the rotation fixed by $\theta$ inverts.}. +Consider a single stylus (a cylinder of diameter \texttt{D}) that is placed on the $y$-axis at a distance $r$ from the chosen center. In a circular motion, the artist rotates the stylus by an angle $\theta$. The angular velocity will influence the shape of the deformation. The direction of rotation is fixed by the sign of $\theta$. If $\theta>0$ the artist rotates clockwise \footnote{The sign of $r$ can also indicate the direction of rotation. If $r<0$ the direction of the rotation fixed by $\theta$ inverts.}. \begin{verbatim} cx cy [ r ] w th D stir cx, cy Center coordinates in mm. [ r ] List of radii in mm. w Angular velocity in degrees/s. -th=theta Angle displacement at tines in degrees. +th Angle displacement at tines in degrees (clockwise). D Tine diameter in mm. \end{verbatim} @@ -1464,7 +1598,7 @@ D Tine diameter in mm. \textbf{Explanations for the key \texttt{th}:} -Setting: \verb! 0 0 [ 350 ] 10 70 10 stir ! +Setting: \verb! 0 0 [ 350 ] 10 -70 10 stir ! \textbf{All} points on the circle are rotated by \texttt{th=70}. There is \textbf{no} partial stir operation. \begin{center} @@ -1485,7 +1619,7 @@ Setting: \verb! 0 0 [ 350 ] 10 70 10 stir ! 350 20 cos mul 350 20 sin mul 15 [0.49 0.75 0.79] drop 350 40 cos mul 350 40 sin mul 15 [0.9 0.8 0.47] drop 350 60 cos mul 350 60 sin mul 15 [0.98 0.27 0.317] drop - 0 0 [ 350 ] 10 70 10 stir + 0 0 [ 350 ] 10 -70 10 stir }] \psarc[arrowinset=0]{->}(0,0){3.9}{0}{70} \psline[linecolor=blue](0;0)(3.5;0) @@ -1706,7 +1840,7 @@ t Time after circulation impulse at center. As t gets very large, the \texttt{/vortex} is modeled by a Lamb-Oseen vortex. We refer to the article written by Aubrey Jaffer: \begin{center} -\url{http://people.csail.mit.edu/jaffer/Marbling/vortex.pdf} +\url{https://arxiv.org/abs/1810.04646} \end{center} The documentation illustrates the used parameters: @@ -1828,16 +1962,16 @@ Animated gifs can be seen at: linewidth=0.1, bckg=false, colors={ - (622e07) - (c06d11) - (8f6e1d) - (56410d) - (191504) - }, +(622e07) +(c06d11) +(8f6e1d) +(56410d) +(191504) +}, actions={ 0 0 35 colors 33 concentric-rings 90 100 shift --200 200 -32e3 10 vortex +-200 200 -32e3 10 vortex -200 -200 32e3 10 vortex }](10,10) \psdot[dotstyle=+,dotsize=0.25,linecolor=red](-2,-2) @@ -1849,16 +1983,16 @@ actions={ linewidth=0.1, bckg=false, colors={ - (622e07) - (c06d11) - (8f6e1d) - (56410d) - (191504) - }, +(622e07) +(c06d11) +(8f6e1d) +(56410d) +(191504) +}, actions={ 0 0 35 colors 33 concentric-rings 90 100 shift --200 200 -32e3 10 vortex +-200 200 -32e3 10 vortex -200 -200 32e3 10 vortex }](10,10) \psdot[dotstyle=+,dotsize=0.25,linecolor=red](-2,-2) @@ -1906,7 +2040,7 @@ It is recalled that the coordinates are in mm. If on the interval $-500 <x <500 linewidth=0.2, actions={ 0 0 35 colors 33 concentric-rings - 0 648 0 50 wiggle + -90 648 0 50 wiggle }](10,10) \end{pspicture} \end{center} @@ -1916,7 +2050,7 @@ linewidth=0.2, linewidth=0.2, actions={ 0 0 35 colors 33 concentric-rings - 0 648 0 50 wiggle + -90 648 0 50 wiggle }](10,10) \end{pspicture} \end{verbatim}} @@ -1936,7 +2070,7 @@ $x'=x;\ y'=y+50\sin(5x)$. linewidth=0.2, actions={ 0 0 35 colors 33 concentric-rings - 90 648 0 50 wiggle + 0 648 0 50 wiggle }](10,10) \end{pspicture} \end{center} @@ -1946,7 +2080,7 @@ linewidth=0.2, linewidth=0.2, actions={ 0 0 35 colors 33 concentric-rings - 90 648 0 50 wiggle + 0 648 0 50 wiggle }](10,10) \end{pspicture} \end{verbatim}} @@ -2014,7 +2148,7 @@ actions={% \begin{verbatim} angle rad shift -angle Angle +angle Angle from vertical (clockwise) rad Length of displacement vector \end{verbatim} The choice of units was made, so that 100 pts correspond to 1 cm within the image. \texttt{rad} is the length shifted. @@ -2030,18 +2164,18 @@ colors={ }, actions={% 0 0 43 colors 32 concentric-rings -45 200 shift}] +30 300 shift}] \pstVerb{% /scaleFactor 10 1000 div def -/xS1 45 cos 200 mul scaleFactor mul def -/yS1 45 sin 200 mul scaleFactor mul def +/xS1 30 sin 300 mul scaleFactor mul def +/yS1 30 cos 300 mul scaleFactor mul def }% \rput(!xS1 yS1){\psline(0.5,0)(-0.5,0)\psline(0,0.5)(0,-0.5)} \psline[linestyle=dashed](-5,0)(5,0) \psline[linestyle=dashed](0,-5)(0,5) -\psline[linecolor=red]{->}(0,0)(2;45) -\psarc[linecolor=red](0,0){1}{0}{45} -\uput{0.36}[22.5](0,0){\color{red}$\alpha$} +\psline[linecolor=red]{->}(0,0)(3;60) +\psarcn[linecolor=red]{->}(0,0){2.5}{90}{60} +\uput{1.7}[75](0,0){\color{red}angle} \end{pspicture} \end{center} The displacement vector is given by its \texttt{angle} $\alpha$ and its length \texttt{rad} in pts. @@ -2057,18 +2191,18 @@ colors={ }, actions={% 0 0 43 colors 32 concentric-rings -45 200 shift}] +30 300 shift}] \pstVerb{% /scaleFactor 10 1000 div def -/xS1 45 cos 200 mul scaleFactor mul def -/yS1 45 sin 200 mul scaleFactor mul def +/xS1 30 sin 300 mul scaleFactor mul def +/yS1 30 cos 300 mul scaleFactor mul def }% \rput(!xS1 yS1){\psline(0.5,0)(-0.5,0)\psline(0,0.5)(0,-0.5)} \psline[linestyle=dashed](-5,0)(5,0) \psline[linestyle=dashed](0,-5)(0,5) -\psline[linecolor=red]{->}(0,0)(2;45) -\psarc[linecolor=red](0,0){1}{0}{45} -\uput{0.36}[22.5](0,0){\color{red}$\alpha$} +\psline[linecolor=red]{->}(0,0)(3;60) +\psarcn[linecolor=red]{->}(0,0){2.5}{90}{60} +\uput{1.7}[75](0,0){\color{red}angle} \end{pspicture} \end{verbatim}} @@ -2095,11 +2229,11 @@ colors={ actions={% 0 0 45 colors 26 concentric-rings -30 150 shift - -100 20 140 - {/idx exch def - -270 idx sub -30 idx 2 mul add [-270 idx 3 mul sub] 10 -90 50 stir - } for -90 720 0 10 wiggle +-100 20 140 +{/idx exch def +-270 idx sub -30 idx 2 mul add [-270 idx 3 mul sub] 10 90 50 stir +} for +0 720 0 10 wiggle }](8,24) \end{pspicture*} \end{center} @@ -2116,11 +2250,11 @@ colors={ actions={% 0 0 45 colors 26 concentric-rings -30 150 shift - -100 20 140 - {/idx exch def - -270 idx sub -30 idx 2 mul add [-270 idx 3 mul sub] 10 -90 50 stir - } for -90 720 0 10 wiggle +-100 20 140 +{/idx exch def +-270 idx sub -30 idx 2 mul add [-270 idx 3 mul sub] 10 90 50 stir +} for +0 720 0 10 wiggle }](8,24) \end{pspicture*} \end{verbatim}} @@ -2134,59 +2268,51 @@ actions={% \begin{center} \begin{pspicture}(-5,-5)(5,5) \psMarble[viscosity=1000, - background={[0.9 0.9 0.9]}, - actions={ - -400 200 400 {/cy exch def - -400 200 400 {/cx exch def - cx cy 75 [0.22 0.27 0.40] drop - } for - } for - -400 200 400 {/cy exch def - -400 200 400 {/cx exch def - cx cy 75 [0.49 0.75 0.79] drop - } for - } for - -400 200 400 {/cy exch def - -400 200 400 {/cx exch def - cx cy 75 [0.90 0.80 0.47] drop - } for - } for - -400 200 400 {/cy exch def - -400 200 400 {/cx exch def - cx cy 50 [0.98 0.27 0.32] drop - } for - } for +background={[0.9 0.9 0.9]}, +actions={ + -400 200 400 + {/idx exch def + 0 idx 90 [ 5 200 0 tines ] [0.22 0.27 0.40] 80 line-drops + } for + -400 200 400 + {/idx exch def + 0 idx 90 [ 5 200 10 tines ] [0.49 0.75 0.79] 60 line-drops + } for + -400 200 400 + {/idx exch def + 0 idx 90 [ 5 200 -5 tines ] [0.90 0.80 0.47] 30 line-drops + } for + -400 200 400 + {/idx exch def + 0 idx 90 [ 5 200 -5 tines ] [0.98 0.27 0.32] 60 line-drops + } for 180 [11 100 0 tines] 50 100 30 rake - }](10,10) +}](10,10) \end{pspicture} \end{center} {\small\begin{verbatim} \begin{pspicture}(-5,-5)(5,5) \psMarble[viscosity=1000, - background={[0.9 0.9 0.9]}, - actions={ - -400 200 400 {/cy exch def - -400 200 400 {/cx exch def - cx cy 75 [0.22 0.27 0.40] drop - } for - } for - -400 200 400 {/cy exch def - -400 200 400 {/cx exch def - cx cy 75 [0.49 0.75 0.79] drop - } for - } for - -400 200 400 {/cy exch def - -400 200 400 {/cx exch def - cx cy 75 [0.90 0.80 0.47] drop - } for - } for - -400 200 400 {/cy exch def - -400 200 400 {/cx exch def - cx cy 50 [0.98 0.27 0.32] drop - } for - } for +background={[0.9 0.9 0.9]}, +actions={ + -400 200 400 + {/idx exch def + 0 idx 90 [ 5 200 0 tines ] [0.22 0.27 0.40] 80 line-drops + } for + -400 200 400 + {/idx exch def + 0 idx 90 [ 5 200 10 tines ] [0.49 0.75 0.79] 60 line-drops + } for + -400 200 400 + {/idx exch def + 0 idx 90 [ 5 200 -5 tines ] [0.90 0.80 0.47] 30 line-drops + } for + -400 200 400 + {/idx exch def + 0 idx 90 [ 5 200 -5 tines ] [0.98 0.27 0.32] 60 line-drops + } for 180 [11 100 0 tines] 50 100 30 rake - }](10,10) +}](10,10) \end{pspicture} \end{verbatim}} @@ -2287,14 +2413,14 @@ colors={ [0.96 0.85 0.10] }, actions={ - 0 0 30 colors 20 concentric-rings + 0 0 25 colors 15 concentric-rings 0 0 100 [0.78 0.02 0.10] drop 0 0 50 [0.77 0.92 0.47] drop 0 0 20 [0.11 0.18 0.00] drop 0 72 359 { /a exch 2 mul def - a sin 400 mul a cos 400 mul a sin 100 mul a cos 100 mul 10 50 stroke + a sin 400 mul a cos 400 mul a sin 100 mul a cos 100 mul 10 50 stylus } for }}% \psMarble(10,10) @@ -2318,14 +2444,14 @@ colors={ [0.96 0.85 0.10] }, actions={ - 0 0 30 colors 20 concentric-rings + 0 0 25 colors 15 concentric-rings 0 0 100 [0.78 0.02 0.10] drop 0 0 50 [0.77 0.92 0.47] drop 0 0 20 [0.11 0.18 0.00] drop 0 72 359 { /a exch 2 mul def - a sin 400 mul a cos 400 mul a sin 100 mul a cos 100 mul 10 50 stroke + a sin 400 mul a cos 400 mul a sin 100 mul a cos 100 mul 10 50 stylus } for }}% \psMarble(10,10) @@ -2354,16 +2480,16 @@ actions={% 0 0 rad [1.00 0.04 0.08] drop } for -500 100 0 {/xpos exch def - xpos -500 xpos 0 50 20 stroke + xpos -500 xpos 0 50 20 stylus } for 0 100 500 {/xpos exch def - xpos 500 xpos 0 50 20 stroke + xpos 500 xpos 0 50 20 stylus } for -500 100 0 {/ypos exch def - 500 ypos 0 ypos 50 20 stroke + 500 ypos 0 ypos 50 20 stylus } for 0 100 500 {/ypos exch def - -500 ypos 0 ypos 50 20 stroke + -500 ypos 0 ypos 50 20 stylus } for }](10,10) \end{pspicture} @@ -2381,16 +2507,16 @@ actions={% 0 0 rad [1.00 0.04 0.08] drop } for -500 100 0 {/xpos exch def - xpos -500 xpos 0 50 20 stroke + xpos -500 xpos 0 50 20 stylus } for 0 100 500 {/xpos exch def - xpos 500 xpos 0 50 20 stroke + xpos 500 xpos 0 50 20 stylus } for -500 100 0 {/ypos exch def - 500 ypos 0 ypos 50 20 stroke + 500 ypos 0 ypos 50 20 stylus } for 0 100 500 {/ypos exch def - -500 ypos 0 ypos 50 20 stroke + -500 ypos 0 ypos 50 20 stylus } for }](10,10) \end{pspicture} @@ -2410,14 +2536,12 @@ actions={% }, viscosity=1000, actions={ - -300 92 500 - { - 0 exch 90 [ 12 100 -100 tines ] [ 76 95 63 ] 45 line-drops - } for - 90 [ 9 220 0 tines ] 40 200 31 rake - -90 [ 9 220 -100 tines ] 40 200 31 rake - 0 0 [ -350 ] 30 30 15 stir - 0 0 [ -150 ] 60 30 15 stir + 0 0 [ 12 100 -100 tines ] [ 12 98 80 tines ] 0 [ 76 95 63 ] 45 serpentine-drops + 0 0 [ 12 115 -100 tines ] [ 12 109.5 3 tines ] 0 [ 176 195 63 ] 20 serpentine-drops + 90 [ 9 228 18 tines ] 40 200 31 rake + -90 [ 9 228 -132 tines ] 40 200 31 rake + 0 0 [ -350 ] 30 30 15 stir + 0 0 [ -150 ] 60 30 15 stir } ](12,12) \end{pspicture} @@ -2430,14 +2554,12 @@ actions={% }, viscosity=1000, actions={ - -300 92 500 - { - 0 exch 90 [ 12 100 -100 tines ] [ 76 95 63 ] 45 line-drops - } for - 90 [ 9 220 0 tines ] 40 200 31 rake - -90 [ 9 220 -100 tines ] 40 200 31 rake - 0 0 [ -350 ] 30 30 15 stir - 0 0 [ -150 ] 60 30 15 stir + 0 0 [ 12 100 -100 tines ] [ 12 98 80 tines ] 0 [ 76 95 63 ] 45 serpentine-drops + 0 0 [ 12 115 -100 tines ] [ 12 109.5 3 tines ] 0 [ 176 195 63 ] 20 serpentine-drops + 90 [ 9 228 18 tines ] 40 200 31 rake + -90 [ 9 228 -132 tines ] 40 200 31 rake + 0 0 [ -350 ] 30 30 15 stir + 0 0 [ -150 ] 60 30 15 stir } ](12,12) \end{pspicture} @@ -2479,117 +2601,117 @@ actions={ \begin{minipage}[t]{10cm}\kern0pt \begin{pspicture}(-5,-5)(5,5) - \psMarble[ - background={ - [0.9 0.9 0.9] - }, - colors={ - [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] - }, - viscosity=1000, - actions={ - 0 0 600 colors 4 get drop - -200 -90 100 colors 5 get drop - -200 -200 200 colors 0 get drop - -200 200 200 colors 1 get drop - 200 -200 200 colors 2 get drop - 200 200 200 colors 3 get drop - 0 0 -32e3 750 vortex - 0 -500 850 -30 212 -5 colors 1 get 5 50 coil-drops - 0 -500 840 -30 215 5 colors 0 get 5 50 coil-drops - 0 -500 850 -30 220 0 colors 4 get 5 50 coil-drops - 0 0 150 0 70 10 [105 160 99] 35 20 coil-drops - 250 0 [ 120 80 ] 20 -100 20 stir - } - ] - \psMarble[ - colors={ - [0 0 0] - [0 0 0] - [0 0 0] - [0 0 0] - [0 0 0] - [0 0 0] - }, - viscosity=1000,drawcontours,linewidth=0.2,linecolor=black,bckg=false, - actions={ - 0 0 600 colors 4 get drop - -200 -90 100 colors 5 get drop - -200 -200 200 colors 0 get drop - -200 200 200 colors 1 get drop - 200 -200 200 colors 2 get drop - 200 200 200 colors 3 get drop - 0 0 -32e3 750 vortex - 0 -500 850 -30 212 -5 colors 1 get 5 50 coil-drops - 0 -500 840 -30 215 5 colors 0 get 5 50 coil-drops - 0 -500 850 -30 220 0 colors 4 get 5 50 coil-drops - 0 0 150 0 70 10 [0 0 0] 35 20 coil-drops - 250 0 [ 120 80 ] 20 -100 20 stir - } - ] +\psMarble[ +background={ +[0.9 0.9 0.9] +}, +colors={ +[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] +}, +viscosity=1000, +actions={ +0 0 600 colors 4 get drop +-200 -90 100 colors 5 get drop +-200 -200 200 colors 0 get drop +-200 200 200 colors 1 get drop +200 -200 200 colors 2 get drop +200 200 200 colors 3 get drop +0 0 32e3 750 vortex +0 -500 850 -30 212 -5 colors 1 get 5 50 coil-drops +0 -500 840 -30 215 5 colors 0 get 5 50 coil-drops +0 -500 850 -30 220 0 colors 4 get 5 50 coil-drops +0 0 150 0 70 10 [105 160 99] 35 20 coil-drops +250 0 [ 120 80 ] 20 100 20 stir +} +] +\psMarble[ +colors={ +[0 0 0] +[0 0 0] +[0 0 0] +[0 0 0] +[0 0 0] +[0 0 0] +}, +viscosity=1000,drawcontours,linewidth=0.2,linecolor=black,bckg=false, +actions={ +0 0 600 colors 4 get drop +-200 -90 100 colors 5 get drop +-200 -200 200 colors 0 get drop +-200 200 200 colors 1 get drop +200 -200 200 colors 2 get drop +200 200 200 colors 3 get drop +0 0 32e3 750 vortex +0 -500 850 -30 212 -5 colors 1 get 5 50 coil-drops +0 -500 840 -30 215 5 colors 0 get 5 50 coil-drops +0 -500 850 -30 220 0 colors 4 get 5 50 coil-drops +0 0 150 0 70 10 [0 0 0] 35 20 coil-drops +250 0 [ 120 80 ] 20 100 20 stir +} +] \end{pspicture} \end{minipage} \begin{minipage}[t]{8cm} {\tiny\begin{verbatim} \begin{pspicture}(-5,-5)(5,5) - \psMarble[ - background={ - [0.9 0.9 0.9] - }, - colors={ - [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] - }, - viscosity=1000, - actions={ - 0 0 600 colors 4 get drop - -200 -90 100 colors 5 get drop - -200 -200 200 colors 0 get drop - -200 200 200 colors 1 get drop - 200 -200 200 colors 2 get drop - 200 200 200 colors 3 get drop - 0 0 -32e3 750 vortex - 0 -500 850 -30 212 -5 colors 1 get 5 50 coil-drops - 0 -500 840 -30 215 5 colors 0 get 5 50 coil-drops - 0 -500 850 -30 220 0 colors 4 get 5 50 coil-drops - 0 0 150 0 70 10 [105 160 99] 35 20 coil-drops - 250 0 [ 120 80 ] 20 -100 20 stir - } - ] - \psMarble[ - colors={ - [0 0 0] - [0 0 0] - [0 0 0] - [0 0 0] - [0 0 0] - [0 0 0] - }, - viscosity=1000,drawcontours,linewidth=0.2,linecolor=black,bckg=false, - actions={ - 0 0 600 colors 4 get drop - -200 -90 100 colors 5 get drop - -200 -200 200 colors 0 get drop - -200 200 200 colors 1 get drop - 200 -200 200 colors 2 get drop - 200 200 200 colors 3 get drop - 0 0 -32e3 750 vortex - 0 -500 850 -30 212 -5 colors 1 get 5 50 coil-drops - 0 -500 840 -30 215 5 colors 0 get 5 50 coil-drops - 0 -500 850 -30 220 0 colors 4 get 5 50 coil-drops - 0 0 150 0 70 10 [0 0 0] 35 20 coil-drops - 250 0 [ 120 80 ] 20 -100 20 stir - } - ] +\psMarble[ +background={ +[0.9 0.9 0.9] +}, +colors={ +[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] +}, +viscosity=1000, +actions={ +0 0 600 colors 4 get drop +-200 -90 100 colors 5 get drop +-200 -200 200 colors 0 get drop +-200 200 200 colors 1 get drop +200 -200 200 colors 2 get drop +200 200 200 colors 3 get drop +0 0 32e3 750 vortex +0 -500 850 -30 212 -5 colors 1 get 5 50 coil-drops +0 -500 840 -30 215 5 colors 0 get 5 50 coil-drops +0 -500 850 -30 220 0 colors 4 get 5 50 coil-drops +0 0 150 0 70 10 [105 160 99] 35 20 coil-drops +250 0 [ 120 80 ] 20 100 20 stir +} +] +\psMarble[ +colors={ +[0 0 0] +[0 0 0] +[0 0 0] +[0 0 0] +[0 0 0] +[0 0 0] +}, +viscosity=1000,drawcontours,linewidth=0.2,linecolor=black,bckg=false, +actions={ +0 0 600 colors 4 get drop +-200 -90 100 colors 5 get drop +-200 -200 200 colors 0 get drop +-200 200 200 colors 1 get drop +200 -200 200 colors 2 get drop +200 200 200 colors 3 get drop +0 0 32e3 750 vortex +0 -500 850 -30 212 -5 colors 1 get 5 50 coil-drops +0 -500 840 -30 215 5 colors 0 get 5 50 coil-drops +0 -500 850 -30 220 0 colors 4 get 5 50 coil-drops +0 0 150 0 70 10 [0 0 0] 35 20 coil-drops +250 0 [ 120 80 ] 20 100 20 stir +} +] \end{pspicture} \end{verbatim}} \end{minipage} @@ -2619,22 +2741,22 @@ actions={ 0 0 150 [ .9 .9 .8 ] drop 0 0 500 colors 2 get drop 0 0 283 0 1 colors 1 get 30 30 Gaussian-drops - 0 0 50e3 100 vortex + 0 0 -50e3 100 vortex %% tulip 0 -250 55 colors 0 get drop 0 -200 35 colors 2 get drop 0 -150 55 colors 0 get drop 0 -100 35 colors 2 get drop 0 -50 55 colors 0 get drop - 0 75 0 -450 20 30 stroke + 0 75 0 -450 20 30 stylus %% wreath 0 10 390 90 95 0 colors 1 get 14 25 coil-drops 0 0 400 90 100 0 colors 0 get 14 40 coil-drops - 0 0 [ 400 ] 1 20 31 stir + 0 0 [ -400 ] 1 20 31 stir %% short vine -100 250 75 [ 6 80 0 tines ] colors 1 get 20 line-drops -100 250 75 [ 6 80 0 tines ] colors 0 get 30 line-drops - -300 200 300 350 20 30 stroke + -300 200 300 350 20 30 stylus } ](12,12) \end{pspicture} @@ -2658,22 +2780,22 @@ actions={ 0 0 150 [ .9 .9 .8 ] drop 0 0 500 colors 2 get drop 0 0 283 0 1 colors 1 get 30 30 Gaussian-drops - 0 0 50e3 100 vortex + 0 0 -50e3 100 vortex %% tulip 0 -250 55 colors 0 get drop 0 -200 35 colors 2 get drop 0 -150 55 colors 0 get drop 0 -100 35 colors 2 get drop 0 -50 55 colors 0 get drop - 0 75 0 -450 20 30 stroke + 0 75 0 -450 20 30 stylus %% wreath 0 10 390 90 95 0 colors 1 get 14 25 coil-drops 0 0 400 90 100 0 colors 0 get 14 40 coil-drops - 0 0 [ 400 ] 1 20 31 stir + 0 0 [ -400 ] 1 20 31 stir %% short vine -100 250 75 [ 6 80 0 tines ] colors 1 get 20 line-drops -100 250 75 [ 6 80 0 tines ] colors 0 get 30 line-drops - -300 200 300 350 20 30 stroke + -300 200 300 350 20 30 stylus } ](12,12) \end{pspicture} @@ -2687,7 +2809,7 @@ actions={ \begin{center} \begin{pspicture}(-6,-6)(6,6) - \psMarble[background={[1 1 1]}, + \psMarble[ 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] @@ -2697,17 +2819,17 @@ actions={ }, actions={ 0 0 48 colors 25 concentric-rings - 90 [2 600 -150 tines] 100 750 31 rake - -90 [2 600 -150 tines] 100 750 31 rake - 0 230 shift + 90 [-150 450] 100 750 31 rake + -90 [-150 450] 100 750 31 rake 180 [ 25 50 0 tines ] 30 200 31 rake + 0 230 shift } ](12,12) \end{pspicture} \end{center} {\small\begin{verbatim} \begin{pspicture}(-6,-6)(6,6) - \psMarble[background={[1 1 1]}, + \psMarble[ 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] @@ -2717,10 +2839,10 @@ actions={ }, actions={ 0 0 48 colors 25 concentric-rings - 90 [2 600 -150 tines] 100 750 31 rake - -90 [2 600 -150 tines] 100 750 31 rake - 0 230 shift + 90 [-150 450] 100 750 31 rake + -90 [-150 450] 100 750 31 rake 180 [ 25 50 0 tines ] 30 200 31 rake + 0 230 shift } ](12,12) \end{pspicture} @@ -2768,7 +2890,7 @@ actions={ actions={ 0 0 1100 1100 0 [ 222 186 149 ] 85 1.72 10 mul uniform-drops 0 0 1100 1100 0 colors 250 1.72 16 mul uniform-drops - 0 0 1100 1100 0 [ 222 186 149 ] 100 1.72 7 mul uniform-drops + 0 0 1100 1100 0 [ 222 186 149 ] 100 1.72 7 mul uniform-drops 0 0 [ -100 ] 40 300 31 stir 0 0 [ -200 -275 ] 20 120 10 stir 0 0 [ -325 ] 20 90 31 stir @@ -2783,33 +2905,50 @@ actions={ \textbf{Example 13: Blendmodes} -In case one want to overlap various marblings one can use the following blendmodes: +In case one want to overlap various marblings one can use the following blendmodes (basic option in PSTricks): + +\texttt{/Normal: blendmode=0}, +\texttt{/Compatible: blendmode=1}, +\texttt{/Screen: blendmode=2}, +\texttt{/Multiply: blendmode=3}, -\texttt{/Lighten}, \texttt{/Darken}, \texttt{/Normal}, \texttt{/Multiply}, \texttt{/Screen}, \texttt{/Overlay}, \texttt{/ColorDodge}, \texttt{/ColorBurn}, \texttt{/HardLight}, \texttt{/SoftLight}, \texttt{/Difference}, \texttt{/Exclusion}, \texttt{/Saturation}, \texttt{/Color}, \texttt{/Luminosity}. +\texttt{/HardLight: blendmode=4}, +\texttt{/Darken: blendmode=5}, +\texttt{/Lighten: blendmode=6}, +\texttt{/Difference: blendmode=7}, -The blendmode is setup right after \texttt{actions=\{} like: \texttt{/Darken .setblendmode} or some other of the blendmodes. +\texttt{/ColorDodge: blendmode=8}, +\texttt{/ColorBurn: blendmode=9}, +\texttt{/SoftLight: blendmode=10}, +\texttt{/Hue: blendmode=11}, -For Distiller users we set the equivalent: \texttt{[ /BM /Darken /ca 1 /CA 1 /SetTransparency pdfmark} +\texttt{/Saturation: blendmode=12}, +\texttt{/Luminosity: blendmode=13}, +\texttt{/Overlay: blendmode=14}, + +\texttt{/Exclusion: blendmode=15}, +\texttt{/Color: blendmode=16}. + +Just set +\begin{verbatim} +\psMarble[blendmode=5,shapealpha=1, ...] +\end{verbatim} \medskip \begin{center} \begin{pspicture}(-4,-4)(4,4) -\psMarble[viscosity=1000, +\psMarble[blendmode=5,shapealpha=1,viscosity=1000, actions={ -%/Darken .setblendmode % ps2pdf -[ /BM /Darken /ca 1 /CA 1 /SetTransparency pdfmark % Distiller 0 0 200 0 1 [1 0 0] 10 50 Gaussian-drops 0 0 200 0 1 [0.7 0.5 0] 50 20 Gaussian-drops 0 0 300 0 1 [0 0 0.5] 15 75 Gaussian-drops }](8,8) -\psMarble[viscosity=1000,bckg=false, +\psMarble[blendmode=5,shapealpha=1,viscosity=1000,bckg=false, actions={ -%/Darken .setblendmode % ps2pdf -[ /BM /Darken /ca 1 /CA 1 /SetTransparency pdfmark % Distiller -300 92 500 { - 0 exch 90 [ 12 100 -100 tines ] [ 76 95 63 ] 45 line-drops + 0 exch 90 [ 12 100 -100 tines ] [ 76 95 63 ] 45 line-drops } for 90 [11 200 0 tines] 40 200 31 rake -90 [11 200 0 tines] 40 200 31 rake @@ -2820,21 +2959,17 @@ actions={ \end{center} {\small\begin{verbatim} \begin{pspicture}(-4,-4)(4,4) -\psMarble[viscosity=1000, +\psMarble[blendmode=5,shapealpha=1,viscosity=1000, actions={ -%/Darken .setblendmode % ps2pdf -[ /BM /Darken /ca 1 /CA 1 /SetTransparency pdfmark % Distiller 0 0 200 0 1 [1 0 0] 10 50 Gaussian-drops 0 0 200 0 1 [0.7 0.5 0] 50 20 Gaussian-drops 0 0 300 0 1 [0 0 0.5] 15 75 Gaussian-drops }](8,8) -\psMarble[viscosity=1000,bckg=false, +\psMarble[blendmode=5,shapealpha=1,viscosity=1000,bckg=false, actions={ -%/Darken .setblendmode % ps2pdf -[ /BM /Darken /ca 1 /CA 1 /SetTransparency pdfmark % Distiller -300 92 500 { - 0 exch 90 [ 12 100 -100 tines ] [ 76 95 63 ] 45 line-drops + 0 exch 90 [ 12 100 -100 tines ] [ 76 95 63 ] 45 line-drops } for 90 [11 200 0 tines] 40 200 31 rake -90 [11 200 0 tines] 40 200 31 rake @@ -2850,31 +2985,32 @@ actions={ \textbf{Example 14: Transparency} -In case one want to overlap various marblings one can also use transparency: +In case one want to overlap various marblings one can also use transparency, which is a basic option in PSTricks \texttt{opacity=}. Just set +\begin{verbatim} +\psMarble[opacity=0.45, ...] +\end{verbatim} +The values need to be from 0 to 1. -The transparency is setup right after \texttt{actions=\{} like: \texttt{0.45 .setopacityalpha} or some other value between 0 and 1. -For Distiller users we set the equivalent: \texttt{[ /ca 0.45 /CA 0.45 /SetTransparency pdfmark} +%The transparency is setup right after \texttt{actions=\{} like: \texttt{0.45 .setopacityalpha} or some other value between 0 and 1. +% +%For Distiller users we set the equivalent: \texttt{[ /ca 0.45 /CA 0.45 /SetTransparency pdfmark} \medskip \begin{center} \begin{pspicture}(-4,-4)(4,4) -\psMarble[viscosity=1000, +\psMarble[opacity=0.35,viscosity=1000, actions={ -%0.45 .setopacityalpha % ps2pdf -[ /ca 0.35 /CA 0.35 /SetTransparency pdfmark % Distiller 0 0 200 0 1 [1 0 0] 10 50 Gaussian-drops 0 0 200 0 1 [0 1 0] 50 20 Gaussian-drops 0 0 300 0 1 [0 0 1] 15 75 Gaussian-drops }](8,8) -\psMarble[viscosity=1000,bckg=false, +\psMarble[opacity=0.35,viscosity=1000,bckg=false, actions={ -%0.45 .setopacityalpha % ps2pdf -[ /ca 0.35 /CA 0.35 /SetTransparency pdfmark % Distiller -300 92 500 { - 0 exch 90 [ 12 100 -100 tines ] [ 76 95 63 ] 45 line-drops + 0 exch 90 [ 12 100 -100 tines ] [ 76 95 63 ] 45 line-drops } for 90 [11 200 0 tines] 40 200 31 rake -90 [11 200 0 tines] 40 200 31 rake @@ -2885,21 +3021,17 @@ actions={ \end{center} {\small\begin{verbatim} \begin{pspicture}(-4,-4)(4,4) -\psMarble[viscosity=1000, +\psMarble[opacity=0.35,viscosity=1000, actions={ -%0.45 .setopacityalpha % ps2pdf -[ /ca 0.35 /CA 0.35 /SetTransparency pdfmark % Distiller 0 0 200 0 1 [1 0 0] 10 50 Gaussian-drops 0 0 200 0 1 [0 1 0] 50 20 Gaussian-drops 0 0 300 0 1 [0 0 1] 15 75 Gaussian-drops }](8,8) -\psMarble[viscosity=1000,bckg=false, +\psMarble[opacity=0.35,viscosity=1000,bckg=false, actions={ -%0.45 .setopacityalpha % ps2pdf -[ /ca 0.35 /CA 0.35 /SetTransparency pdfmark % Distiller -300 92 500 { - 0 exch 90 [ 12 100 -100 tines ] [ 76 95 63 ] 45 line-drops + 0 exch 90 [ 12 100 -100 tines ] [ 76 95 63 ] 45 line-drops } for 90 [11 200 0 tines] 40 200 31 rake -90 [11 200 0 tines] 40 200 31 rake @@ -2913,12 +3045,15 @@ actions={ \newpage -\section{Acknowledgements} +\section{Acknowledgments} Many thanks to D. P. Story who coded some additions to the \texttt{pst-marble.pro} file so it might be used for Adobe Distiller users. The file size for the documentation could so be reduced tremendously. +\bigskip + +Also many thanks to A. Grahn who sent a patch to use transparency and blendmode effects with the usual PSTricks options. \newpage diff --git a/Master/texmf-dist/dvips/pst-marble/pst-marble.pro b/Master/texmf-dist/dvips/pst-marble/pst-marble.pro index b48b17ce106..d5e2b68de04 100644 --- a/Master/texmf-dist/dvips/pst-marble/pst-marble.pro +++ b/Master/texmf-dist/dvips/pst-marble/pst-marble.pro @@ -3,7 +3,7 @@ %%Copyright: 2018, 2019 Aubrey Jaffer %%Creator: Aubrey Jaffer %%For: Voluntocracy -%%CreationDate: 2019-01-23 +%%CreationDate: 2019-02-10 /plotdict 100 dict def plotdict begin @@ -32,21 +32,25 @@ systemdict /arcsin known not { type dup /realtype eq exch /integertype eq or } bind def +/cos-sin % th --> sin-th cos-th +{ + dup cos exch sin +} bind def + % negative viscosity for (raster) reverse-marbling /marble % nu (viscosity) { - dup /nu exch 1e-6 mul abs def - /reverse-rendering? exch 0 lt def - +% dup /nu exch 1e-6 mul abs def +% /reverse-rendering? oversample 0 gt def % 0 setlinewidth - reverse-rendering? + oversample 0 gt { matrix currentmatrix aload pop 6 {round 6 1 roll} repeat matrix astore setmatrix newpath } if % clippath pathbbox /hiy exch round cvi def /hix exch round cvi def % /loy exch round cvi def /lox exch round cvi def - reverse-rendering? not {background aload pop setrgbcolor fill} if +% oversample 0 gt not {background aload pop setrgbcolor fill} if /scl hiy loy sub hix lox sub max def % /orgx hix lox add 2 div def % /orgy hiy loy add 2 div def @@ -58,33 +62,37 @@ systemdict /arcsin known not { actions sdx get aload pop /ct exch def ct /drop eq { - pop pop pop /cy exch .001 mul def /cx exch .001 mul def + pop pop pop /cy exch def /cx exch def cx cy sdx find-drop-background /bgc exch def actions sdx get 3 bgc put } { - ct /vortex eq - {pop pop pop pop} + ct /rake eq + {pop pop pop pop pop pop} { - ct /stroke eq ct /rake eq or - {pop pop pop pop pop} + ct /wiggle eq + {numeric? {pop pop pop} if pop} { - ct /stir eq - {pop pop pop pop pop pop} + ct /offset eq + {pop pop} { - ct /wiggle eq - {numeric? {pop pop} if pop} + ct /vortex eq + {pop pop pop pop} { - ct /offset eq - {pop pop} - {(unrecognized token) = ct =} ifelse + ct /stir eq + {pop pop pop pop pop} + { + ct /stylus eq + {pop pop pop pop pop pop pop pop pop pop} + {(unrecognized token) = ct =} ifelse + } ifelse } ifelse } ifelse } ifelse } ifelse } ifelse } for - reverse-rendering? + oversample 0 gt { do-raster } @@ -97,23 +105,23 @@ systemdict /arcsin known not { /ct-dispatch { - ct /rake eq - {rake-deformation} + ct /wiggle eq + {wiggle-deformation} { - ct /stroke eq - {stroke-deformation} + ct /offset eq + {offset-deformation} { - ct /stir eq - {stir-deformation} + ct /rake eq + {rake-deformation} { ct /vortex eq {vortex-deformation} { - ct /wiggle eq - {wiggle-deformation} + ct /stir eq + {stir-deformation} { - ct /offset eq - {offset-deformation} + ct /stylus eq + {stylus-deformation} {(unrecognized token) = ct =} ifelse } ifelse } ifelse @@ -132,11 +140,11 @@ systemdict /arcsin known not { actions cdx get aload pop /ct exch def ct /drop eq % movement due to drop. - { % px py cx cy rad rgb + { % px py cx cy rad^2 rgb /rgb exch def pop % /bgc exch def - /rad^2 exch .001 mul dup mul def - /cy exch .001 mul def /cx exch .001 mul def + /rad^2 exch def + /cy exch def /cx exch def /py exch def /px exch def /a^2 px cx sub dup mul py cy sub dup mul add def a^2 1e-10 lt {0.} {1. rad^2 a^2 div sub} ifelse @@ -156,31 +164,29 @@ systemdict /arcsin known not { /offset-deformation % px py dx dy --> px py { - /dy exch .001 mul def /dx exch .001 mul def - dy reverse-rendering? {neg} if add exch - dx reverse-rendering? {neg} if add exch + /dy exch def /dx exch def + dy add exch + dx add exch } bind def -/wiggle-deformation % px py angle period ofst depth --> px py +/wiggle-deformation % px py dx dy period ofst depth --> px py { dup numeric? { /depth exch def /ofst exch def /period exch def - /ang exch def - /dy ang cos def /dx ang sin def + /dy exch def /dx exch def /py exch def /px exch def - /a py dx mul px dy mul sub 1000 360 div period mul mul ofst add sin - depth mul 1e-3 mul reverse-rendering? {neg} if def + /a py dx mul px dy mul sub period mul ofst add sin depth mul def } { % old-style: px py ang {func} --> px py - /func exch def /ang exch def + /func exch def /ang exch 90 sub def /dy ang cos def /dx ang sin def /py exch def /px exch def /a py dx mul px dy mul sub 1000 mul func exec - 1e-3 mul reverse-rendering? {neg} if def + 1e-3 mul oversample 0 gt {neg} if def } ifelse px dx a mul add py dy a mul add } bind def @@ -197,115 +203,106 @@ systemdict /arcsin known not { { spacing mul ofst add } for } bind def -/stroke-deformation % px py bx by ex ey V D --> px py +/stylus-deformation % px py bx by ex ey L tU rpts nx ny stpx stpy --> px py { - /D exch .001 mul def /V exch .001 mul abs def - reverse-rendering? { 4 2 roll } if - /ey exch .001 mul def /ex exch .001 mul def - /by exch .001 mul def /bx exch .001 mul def + /stpy exch def /stpx exch def + /ny exch def /nx exch def + /rpts exch def /tU exch def /L exch def + /ey exch def /ex exch def + /by exch def /bx exch def /py exch def /px exch def - /tU ex bx sub dup mul ey by sub dup mul add sqrt def - /L V D dup mul mul nu div def - 1e-6 tU le + /inx 0 def /iny 0 def + 1 1 rpts { - /nx ex bx sub tU div def /ny ey by sub tU div def - /rpts tU L div ceiling cvi def - /stpx ex bx sub rpts div def /stpy ey by sub rpts div def - /ex bx stpx add def /ey by stpy add def - /tU tU rpts div def - /inx 0 def /iny 0 def - 1 1 rpts + pop + /dxB bx px sub def /dyB by py sub def + /dxE ex px sub def /dyE ey py sub def + /r dxB dup mul dyB dup mul add sqrt def + /denr r L div def + denr 6 lt denr 0 gt and { - pop - /dxB bx px sub def /dyB by py sub def - /dxE ex px sub def /dyE ey py sub def - /r dxB dup mul dyB dup mul add sqrt 1e-9 add def - /s dxE dup mul dyE dup mul add sqrt 1e-9 add def + /s dxE dup mul dyE dup mul add sqrt def /txB dxB nx mul dyB ny mul add def /txE dxE nx mul dyE ny mul add def /ty dxB ny mul dyB nx mul sub def - /denr e r L div exp r mul L mul 2 mul def + /denr e denr exp r mul L mul 2 mul def /dens e s L div exp s mul L mul 2 mul def /inx r L mul ty dup mul sub tU mul denr div - s L mul ty dup mul sub tU mul dens div add def + s L mul ty dup mul sub tU mul dens div add def /iny txB ty mul tU mul denr div - txE ty mul tU mul dens div add def + txE ty mul tU mul dens div add def /px px inx nx mul iny ny mul add add def /py py inx ny mul iny nx mul sub add def - /bx ex def /by ey def - /ex ex stpx add def /ey ey stpy add def - } for - } if + } if + /bx ex def /by ey def + /ex ex stpx add def /ey ey stpy add def + } for px py } bind def -/rake-deformation % [ ang [ rs ] V tU D /rake ] +/rake-deformation % [ dx dy [ rs ] V tU L^-1 /rake ] { - /D exch .001 mul def /tU exch .001 mul def /V exch .001 mul abs def - /rs exch def /ang exch def + /L^-1 exch def /tU exch def /V exch def + /rs exch def /dy exch def /dx exch def /py exch def /px exch def - /dy ang cos def /dx ang sin def - /L^-1 nu V D dup mul mul div def /a 0 def rs { - /r exch .001 mul def + /r exch def /bx dy r mul def /by dx r mul neg def px bx sub dy mul py by sub dx mul sub abs L^-1 mul e^-1 exch exp tU mul a add /a exch def } forall - /a a reverse-rendering? {neg} if def px dx a mul add py dy a mul add } bind def -/stir-deformation % [ cx cy [ rs ] w th D /stir ] +/stir-deformation % [ cx cy [ rs ] th L^-1 /stir ] { - /D exch .001 mul def /th exch def /w exch abs def - /rs exch def - /cy exch .001 mul def /cx exch .001 mul def + /L^-1 exch def /th exch def /rs exch def + /cy exch def /cx exch def /py exch def /px exch def /p-c px cx sub dup mul py cy sub dup mul add sqrt def /a 0 def 1e-6 p-c lt - {rs { - /r exch .001 mul def - /L^-1 nu w pi 180 div mul r abs mul D dup mul mul div def - /a p-c r abs sub abs L^-1 mul e^-1 exch exp th mul r 0 lt {neg} if - a add def - } forall - /a a reverse-rendering? {neg} if def - } if - px cx sub py cy sub - [ a dup cos exch sin 2 copy neg exch cx cy ] transform + { rs + { /r exch def + /a p-c r abs sub abs L^-1 r abs div mul e^-1 exch exp th mul + r 0 gt {neg} if a add def + } forall + oversample 0 gt {/a a neg def} if + px cx sub py cy sub + [ a cos-sin 2 copy neg exch cx cy ] transform + } + {px py} ifelse } bind def % An irrotational vortex. circ is circulation; t is time in seconds /vortex-deformation % px py cx cy circ t --> px py { - /t exch def /circ exch 1e-6 mul def - /cy exch .001 mul def /cx exch .001 mul def + /tcoef exch def + /circ exch def + /cy exch def /cx exch def /py exch def /px exch def /p-c^2 px cx sub dup mul py cy sub dup mul add def - /a p-c^2 1e-6 lt - {0} - { nu 4 mul .75 exp - p-c^2 2 pi mul mul t div .75 exp - add m4o3 exp - 180 pi div mul circ mul reverse-rendering? {neg} if } - ifelse def - px cx sub py cy sub - [ a dup cos exch sin 2 copy neg exch cx cy ] transform + p-c^2 1e-6 lt + { px py } + { + /a nuterm p-c^2 tcoef mul .75 exp add m4o3 exp circ mul def + px cx sub py cy sub + [ a cos-sin 2 copy neg exch cx cy ] transform + } + ifelse } bind def %% Functions used for forward rendering: % movement due to drop. -/spread % px py cx cy rad --> px py +/spread % px py cx cy rad^2 --> px py { - /rad exch .001 mul def /cy exch .001 mul def /cx exch .001 mul def + /rad^2 exch def /cy exch def /cx exch def /py exch def /px exch def /p-c^2 px cx sub dup mul py cy sub dup mul add def - /a rad dup mul p-c^2 div 1 add sqrt def + /a rad^2 p-c^2 div 1 add sqrt def py cy sub px cx sub a mul cx add exch a mul cy add } bind def @@ -330,22 +327,6 @@ systemdict /arcsin known not { } bind def % Draws and fills circle as distorted by composite-map -/do-action -{ - Ir Cx add Cy composite-map moveto - Ir 0 - { - dup /oy exch def - Minsky-circle 2 copy - exch Cx add exch Cy add % shift center of drop - composite-map lineto - dup 0 gt oy 0 lt and {exit} if - } loop - pop pop - closepath Contours -} bind def - -% Fills (distorted) circles. /do-drops % acnt = index of last action + 1 { 0 1 acnt -1 add @@ -355,9 +336,20 @@ systemdict /arcsin known not { /drop act eq { aload pop setrgbcolor pop - /Ir exch .001 mul def /Cy exch .001 mul def /Cx exch .001 mul def - /eps 0.005 scl sqrt Ir mul acnt idx sub 1 add log mul div def - do-action + /rad exch sqrt def /Cy exch def /Cx exch def + /eps 0.005 scl sqrt rad mul acnt idx sub 1 add log mul div def + + rad Cx add Cy composite-map moveto + rad 0 + { + dup /oy exch def + Minsky-circle 2 copy + exch Cx add exch Cy add % shift center of drop + composite-map lineto + dup 0 gt oy 0 lt and {exit} if + } loop + pop pop + closepath Contours } if } for } bind def @@ -408,8 +400,8 @@ systemdict /arcsin known not { { % px py cx cy rad^2 rgb /rgb exch def /bgc exch def - /rad^2 exch .001 mul dup mul def - /cy exch .001 mul def /cx exch .001 mul def + /rad^2 exch def + /cy exch def /cx exch def /py exch def /px exch def /a^2 px cx sub dup mul py cy sub dup mul add def a^2 1e-10 lt {0.} {1. rad^2 a^2 div sub} ifelse @@ -438,11 +430,12 @@ systemdict /arcsin known not { /do-raster { - loy 1 hiy + /sampleover 1 oversample div def + loy sampleover hiy { /iy exch def /fy iy orgy sub scl div 1.0 mul def - lox 1 hix + lox sampleover hix { /ix exch def /fx ix orgx sub scl div 1.0 mul def @@ -455,30 +448,29 @@ systemdict /arcsin known not { % ifelse % end color modifications aload pop setrgbcolor - ix iy 1 1 rectfill + newpath ix iy moveto sampleover 0 rlineto 0 sampleover rlineto sampleover neg 0 rlineto closepath FILL } for } for } bind def -% [ cx cy radinc [ bgc ] [ rgb ] /drop ] -% [ cx cy [ r ] w th D /stir ] +% [ cx cy rad^2 [ bgc ] [ rgb ] /drop ] +% [ cx cy [ r ] th L^-1 /stir ] % [ cx cy circ t /vortex ] -% [ bx by ex ey V D /stroke ] -% [ angle [ r ] V tU D /rake ] -% [ angle period ofst depth /wiggle ] +% [ bx by ex ey L tU rpts nx ny stpx stpy /stylus ] +% [ dx dy [ rs ] V tU L^-1 /rake ] +% [ dx dy period ofst depth /wiggle ] % [ dx dy /offset ] -/concatstrings % (a) (b) -> (ab) -{ exch dup length - 2 index length add string +/concatstrings % (a) (b) -> (ab) +{ exch dup length + 2 index length add string dup dup 4 2 roll copy length 4 -1 roll putinterval -} bind def +} bind def /color-norm % rgb { /rgb exch def - rgb type /integertype eq { /rgb [ rgb ] def } if rgb type /stringtype eq { /rgb (16#) rgb concatstrings cvi def /rgb [ @@ -487,67 +479,102 @@ systemdict /arcsin known not { rgb 256 mod 255 div ] def } if - rgb length 1 eq - { - /rgb rgb aload pop def - [ - rgb 65536 idiv 255 div - rgb 256 idiv 256 mod 255 div - rgb 256 mod 255 div - ] - } - { rgb {1 gt} forall or or { [ rgb {255 div} forall ] } { rgb } ifelse } - ifelse + rgb {1 gt} forall or or { [ rgb {255 div} forall ] } { rgb } ifelse +} bind def + +/color-norm* +{ + /clr* exch def + clr* 0 get type dup /arraytype ne exch /stringtype ne and { /clr* [ clr* ] def } if + [ clr* {color-norm} forall ] } bind def -/drop % cx cy radinc rgb +/drop % cx cy rad^2 rgb { /rgb exch def - /radinc exch def - /cy exch def - /cx exch def - [ cx cy radinc -1 rgb color-norm /drop ] + /rad^2 exch .001 mul dup mul def + /cy exch .001 mul def + /cx exch .001 mul def + [ cx cy rad^2 -1 rgb color-norm /drop ] } bind def -/stir % cx cy [ r ] w th D +/vortex % cx cy circ tcoef { - /stir 7 array astore + /t exch def + /circ exch -1e-6 mul 180 pi div mul oversample 0 gt {neg} if def + /cy exch .001 mul def /cx exch .001 mul def + /tcoef 2 pi mul t div def + /nuterm visc 1e-6 mul abs 4 mul .75 exp def + [ cx cy circ tcoef /vortex ] } bind def -/vortex % cx cy circ t +/stylus % bx by ex ey V D { - /vortex 5 array astore + /D exch .001 mul def /V exch .001 mul abs def + oversample 0 gt { 4 2 roll } if % reverse-rendering? + /ey exch .001 mul def /ex exch .001 mul def + /by exch .001 mul def /bx exch .001 mul def + /L V D dup mul mul visc 1e-6 mul abs div def + /tU ex bx sub dup mul ey by sub dup mul add sqrt def + /rpts tU L div ceiling cvi def + /nx ex bx sub tU div def /ny ey by sub tU div def + /tU tU rpts div def + /stpx ex bx sub rpts div def /stpy ey by sub rpts div def + /ex bx stpx add def /ey by stpy add def + 1e-6 tU le { [ bx by ex ey L tU rpts nx ny stpx stpy /stylus ] } if } bind def -/stroke % bx by ex ey V D +/stroke {stylus} bind def + +/stir % cx cy [ r ] w th D { - /stroke 7 array astore + /D exch .001 mul def /th exch def /w exch abs def + /rs exch def + /cy exch .001 mul def /cx exch .001 mul def + /L^-1 visc 1e-6 mul abs w pi 180 div mul D dup mul mul div def + [ cx cy [ rs {.001 mul} forall ] th L^-1 /stir ] } bind def /rake % angle [ r ] V tU D { - /rake 6 array astore + /D exch .001 mul def /tU exch .001 mul def /V exch .001 mul abs def + /rs exch def /ang exch def + [ ang cos-sin exch [ rs {.001 mul} forall ] + V + tU oversample 0 gt {neg} if + visc 1e-6 mul abs V D dup mul mul div % L^-1 + /rake ] } bind def /wiggle % angle period ofst depth { dup numeric? - { /wiggle 5 array astore } + { + /depth exch def + /ofst exch def + /period exch def + /ang exch 90 sub def + [ ang cos-sin exch + 1000 360 div period mul + ofst + depth 1e-3 mul oversample 0 gt {neg} if /wiggle ] } { /wiggle 3 array astore } ifelse } bind def /shift % angle r { - /r exch def + /r exch .001 mul def /th exch def - [ th sin r mul th cos r mul /offset ] + /dx th sin r mul oversample 0 gt {neg} if def + /dy th cos r mul oversample 0 gt {neg} if def + [ dx dy /offset ] } bind def /concentric-rings % xc yc thick [ color ] count { /cnt exch def - /clra exch def + /clra exch color-norm* def /rinc exch def /yc exch def /xc exch def @@ -566,19 +593,18 @@ systemdict /arcsin known not { { /drad exch def /cnt exch def - /clra exch def + /clra exch color-norm* def /rinc exch def /arcinc exch def /th exch def /r exch def /yc exch def /xc exch def - clra 0 get type /arraytype ne { /clra [ clra ] def } if /nclr clra length def /cdx 0 def cnt { - th sin r mul xc add th cos r mul yc add drad clra cdx nclr mod get drop + th cos-sin r mul xc add exch r mul yc add drad clra cdx nclr mod get drop /th th arcinc r div -1 max 1 min arcsin add def /r r rinc add def /cdx cdx 1 add def @@ -588,30 +614,29 @@ systemdict /arcsin known not { /line-drops % xc yc ang [ r ] [ rgb ] drad { /drad exch def - /clra exch def + /clra exch color-norm* def /rs exch def /th exch def /yc exch def /xc exch def - clra 0 get type /arraytype ne { /clra [ clra ] def } if /nclr clra length def /cdx 0 def rs { /r exch def - th sin r mul xc add th cos r mul yc add drad clra cdx nclr mod get drop + th cos-sin r mul xc add exch r mul yc add drad clra cdx nclr mod get drop /cdx cdx 1 add def } forall } bind def -% Copyright (C) 1996-1998 Geoffrey Keating. +% Copyright (C) 1996-1998 Geoffrey Keating. % This file may be freely distributed with or without modifications, % so long as modified versions are marked as such and copyright % notices are not removed. % Modified for PRNG use by Aubrey Jaffer 2019. -% An implementation of an algorithm compatible with the RSA Data Security +% An implementation of an algorithm compatible with the RSA Data Security % Inc. RC4 stream encryption algorithm. % <string> rc4setkey <dict> @@ -667,28 +692,26 @@ systemdict /arcsin known not { /random:normal2 { /rnt random:uniform 360 mul def - /rnr random:uniform log -2 mul e log div sqrt def - rnt cos rnr mul - rnt sin rnr mul + /rnr random:uniform ln -2 mul sqrt def + rnt cos-sin exch rnr mul exch rnr mul } bind def /Gaussian-drops % xc yc r angle eccentricity [ rgb ] cnt drad { /drad exch def /cnt exch def - /clra exch def + /clra exch color-norm* def /eccentricity exch sqrt def - /angle exch def + /angle exch neg def /r exch 2 sqrt div def /yc exch def /xc exch def - clra 0 get type /arraytype ne { /clra [ clra ] def } if /nclr clra length def /cdx 0 def cnt { random:normal2 eccentricity div r mul exch eccentricity mul r mul - [ angle dup cos exch sin 2 copy neg exch xc yc ] transform + [ angle cos-sin 2 copy neg exch xc yc ] transform drad clra cdx nclr mod get drop /cdx cdx 1 add def } repeat @@ -698,25 +721,51 @@ systemdict /arcsin known not { { /drad exch def /cnt exch def - /clra exch def - /angle exch def + /clra exch color-norm* def + /angle exch neg def /ysid exch def /xsid exch def /yc exch def /xc exch def - clra 0 get type /arraytype ne { /clra [ clra ] def } if /nclr clra length def /cdx 0 def cnt { random:uniform 0.5 sub xsid mul random:uniform 0.5 sub ysid mul - [ angle dup cos exch sin 2 copy neg exch xc yc ] transform - drad clra cdx nclr mod get drop + [ angle cos-sin 2 copy neg exch xc yc ] transform + drad clra cdx nclr mod get drop /cdx cdx 1 add def } repeat } bind def +/serpentine-drops % xc yc [ xrs ] [ yrs ] th [ rgb ] drad +{ + /drad exch def + /clra exch color-norm* def + /th exch neg def + /yrs exch def + /xrs exch def + /yc exch def + /xc exch def + /nclr clra length def + /par 0 def + /cdx 0 def + yrs + { + /yr exch def + par 0 eq { 0 1 xrs length 1 sub } { xrs length 1 sub -1 0 } ifelse + { + /xdx exch def + /xr xrs xdx get def + xr yr [ th cos-sin 2 copy neg exch xc yc ] transform + drad clra cdx nclr mod get drop + /cdx cdx 1 add def + } for + /par 1 par sub def + } forall +} bind def + end % Local Variables: % mode: PS 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 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 f6f0d367e87..3c55b57a3f6 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/02/01 package wrapper for PSTricks pst-marble.tex] +\ProvidesPackage{pst-marble}[2019/02/18 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}{% +\IfFileExists{pst-marble.pro}{ \ProvidesFile{pst-marble.pro} - [2019/02/01 v. 1.2, PostScript prologue file ] -\@addtofilelist{pst-marble.pro}}{}% + [2019-02-18 v. 1.3, PostScript prologue file] +\@addtofilelist{pst-marble.pro}}{} \endinput |