texlive[50102] Master/texmf-dist: pst-marble (22feb19)
commits+karl at tug.org
commits+karl at tug.org
Sat Feb 23 23:17:41 CET 2019
Revision: 50102
http://tug.org/svn/texlive?view=revision&revision=50102
Author: karl
Date: 2019-02-23 23:17:40 +0100 (Sat, 23 Feb 2019)
Log Message:
-----------
pst-marble (22feb19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/pst-marble/CHANGES.md
trunk/Master/texmf-dist/doc/generic/pst-marble/README.md
trunk/Master/texmf-dist/doc/generic/pst-marble/examples/Curl.tex
trunk/Master/texmf-dist/doc/generic/pst-marble/pst-marble-doc.pdf
trunk/Master/texmf-dist/doc/generic/pst-marble/pst-marble-doc.tex
trunk/Master/texmf-dist/tex/generic/pst-marble/pst-marble.tex
trunk/Master/texmf-dist/tex/latex/pst-marble/pst-marble.sty
Modified: trunk/Master/texmf-dist/doc/generic/pst-marble/CHANGES.md
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-marble/CHANGES.md 2019-02-23 22:17:17 UTC (rev 50101)
+++ trunk/Master/texmf-dist/doc/generic/pst-marble/CHANGES.md 2019-02-23 22:17:40 UTC (rev 50102)
@@ -1,6 +1,6 @@
# **CHANGES** #
-# pst-marble v. 1.3 #
-# 2019/02/18 #
+# pst-marble v. 1.3a #
+# 2019/02/23 #
Source: pst-marble.tex, pst-marble.sty, pst-marble.pro
Author: Aubrey Jaffer
@@ -328,3 +328,9 @@
with raw PostScript code. Equal now for ps2pdf, xelatex and distiller.
## Bug fixes
+
+---
+
+## Changes in v. 1.3a:
+
+## Bug fixes
Modified: trunk/Master/texmf-dist/doc/generic/pst-marble/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-marble/README.md 2019-02-23 22:17:17 UTC (rev 50101)
+++ trunk/Master/texmf-dist/doc/generic/pst-marble/README.md 2019-02-23 22:17:40 UTC (rev 50102)
@@ -1,6 +1,6 @@
# **README** #
-# pst-marble v. 1.3 #
-# 2019/02/18 #
+# pst-marble v. 1.3a #
+# 2019/02/23 #
Source: pst-marble.tex, pst-marble.sty, pst-marble.pro
Author: Aubrey Jaffer
Modified: trunk/Master/texmf-dist/doc/generic/pst-marble/examples/Curl.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-marble/examples/Curl.tex 2019-02-23 22:17:17 UTC (rev 50101)
+++ trunk/Master/texmf-dist/doc/generic/pst-marble/examples/Curl.tex 2019-02-23 22:17:40 UTC (rev 50102)
@@ -13,12 +13,12 @@
},
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
+ 0 0 1000 1000 0 [ 222 186 149 ] 85 1.72 10 mul uniform-drops
+ 0 0 1000 1000 0 colors 250 1.72 16 mul uniform-drops
+ 0 0 1000 1000 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}
Modified: trunk/Master/texmf-dist/doc/generic/pst-marble/pst-marble-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/pst-marble/pst-marble-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-marble/pst-marble-doc.tex 2019-02-23 22:17:17 UTC (rev 50101)
+++ trunk/Master/texmf-dist/doc/generic/pst-marble/pst-marble-doc.tex 2019-02-23 22:17:40 UTC (rev 50102)
@@ -38,7 +38,7 @@
dvipsnames,
svgnames,
x11names,
- distiller
+% distiller
]{pst-doc}
\usepackage[autostyle]{csquotes}
@@ -55,9 +55,9 @@
\begin{document}
-\title{pst-marble v 1.3}
+\title{pst-marble v 1.3a}
\subtitle{A PSTricks package to draw marble-like patterns}
-\author{%
+\author{
Aubrey \textsc{Jaffer}\\
with the help of\\
Jürgen \textsc{Gilg}\\
@@ -67,6 +67,11 @@
\date{\today}
\maketitle
\tableofcontents
+
+\vfill
+{\small This program can redistributed and/or modified under the terms of the LaTeX Project Public License Distributed from CTAN archives in directory \texttt{macros/latex/base/lppl.txt}; either version 1.3c of the License, or (at your option) any later version.}
+
+
\psset{unit=1cm}
@@ -73,10 +78,8 @@
\clearpage
-\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 end-papers and book covers.
-
+\begin{abstract}
+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}
@@ -132,10 +135,6 @@
\rput{90}(-7,0){\parbox{10cm}{\centering\bf\Large Marbling effects by Aubrey Jaffer\\ and PSTricks}}
\end{pspicture}
\end{verbatim}}
-
-
-\vfill
-{\small This program can redistributed and/or modified under the terms of the LaTeX Project Public License Distributed from CTAN archives in directory \texttt{macros/latex/base/lppl.txt}; either version 1.3c of the License, or (at your option) any later version.}
\end{abstract}
@@ -142,7 +141,7 @@
\clearpage
-\section{Introduction}
+\section{History and Introduction}
%Aubrey Jaffer finds a similarity between whirlwinds in the great spot of jupiter and those that appear in some marbled papers.
%\begin{center}
@@ -433,33 +432,36 @@
\Lcs{psMarble}\OptArgs\Largr{x , y}
\end{BDef}
-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 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}.
+If the \verb!\begin{pspicture}! arguments do not match the optional argument \Largr{x , y}, then the image will be cropped or padded.
+
\medskip
\begin{quote}
-\begin{tabularx}{\linewidth}{ @{} l >{\ttfamily}l X @{} }\toprule
-\textbf{Name} & \textbf{Default} & \textbf{Meaning} \\\midrule
+\begin{tabularx}{\linewidth}{ @{} l >{\ttfamily}l X @{} }
+\toprule
+\textbf{Name} & \textbf{Default} & \textbf{Meaning} \\
+\midrule
\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{oversample} & 0 & This is a rendering option: \texttt{oversample=0} makes the image pixel free; \texttt{oversample>0}: the smaller the positive 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]
- [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]
- }%
- & Colors of the marbling can be set within the rgb-color-system or as hexadecimal color constants\\
+[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]
+} & Colors of the marbling can be set within the rgb-color system or as hexadecimal color constants. Shown are rgb constants between 0 and 1.\\
\Lkeyword{drawcontours} & false & Boolean: if set to \texttt{true}, it only draws the contours\\
\Lkeyword{viscosity} & 1000 & Global primitive: viscosity of the system\\
\bottomrule
@@ -593,7 +595,7 @@
\definecolor{printcolorI}{rgb}{0.365 0.153 0.435}
\definecolor{printcolorJ}{rgb}{0.624 0.588 0.439}
-\newcommand{\myPrint}[2]{%
+\newcommand{\myPrint}[2]{
\begin{pspicture}(-1.6,-1)(1.6,1)
\psframe[linecolor=#1,fillstyle=solid,fillcolor=#1](-1.6,-1)(1.6,1)
\rput(0,0){\footnotesize[#2]}
@@ -641,7 +643,7 @@
\begin{center}
\begin{pspicture}(-3,-3)(3,3)
\psMarble[background={[1 1 1]}, %white
-actions={%
+actions={
0 0 50 [1 0 0] drop
-200 0 70 [0 1 0] drop
200 0 100 [0 0 1] drop
@@ -651,7 +653,7 @@
\begin{verbatim}
\begin{pspicture}(-3,-3)(3,3)
\psMarble[background={[1 1 1]}, %white
-actions={%
+actions={
0 0 50 [1 0 0] drop
-200 0 70 [0 1 0] drop
200 0 100 [0 0 1] drop
@@ -658,7 +660,7 @@
}](6,6)
\end{pspicture}
\end{verbatim}
-\textbf{Note:} The paint drop top most on the stack is left undeformed (intact), whereas all the others are influenced by each other, according to the system constant. There are as well 6 colors predefined which can be used like that:
+\textbf{Note:} The paint drop top most on the stack is left undeformed (intact), whereas all the others are influenced by each other, according to the system constant. There are 10 default colors. Colors can be used like this:
\begin{verbatim}
0 0 50 colors 1 get drop
-200 0 70 colors 2 get drop
@@ -693,7 +695,7 @@
0 250 90 [ 6 80 0 tines ] colors 4 get 20 line-drops
0 -250 90 [ 6 80 50 tines ] [[0.2 0.5 1][1 0 1]] 20 line-drops
}]
-\rput(0,2.5){%
+\rput(0,2.5){
\psdot[linecolor=red](0,0)
\uput[-90](0,0){\textcolor{red}{\texttt{xc,yc}}}
\psline[linecolor=red,linestyle=dashed](0,0)(0,2.5)
@@ -703,7 +705,7 @@
\psline[linecolor=red]{|<->|}(-1.65,0.4)(-0.85,0.4)
\uput[90](-1.25,0.4){\textcolor{red}{\texttt{spacing}}}
}
-\rput(0,-2.5){%
+\rput(0,-2.5){
\psdot[linecolor=red](0,0)
\uput[-90](0,0){\textcolor{red}{\texttt{xc,yc}}}
\psline[linecolor=red](-3,0)(3,0)
@@ -720,7 +722,7 @@
0 250 90 [ 6 80 0 tines ] colors 4 get 20 line-drops
0 -250 90 [ 6 80 50 tines ] [[0.2 0.5 1][1 0 1]] 20 line-drops
}]
-\rput(0,2.5){%
+\rput(0,2.5){
\psdot[linecolor=red](0,0)
\uput[-90](0,0){\textcolor{red}{\texttt{xc,yc}}}
\psline[linecolor=red,linestyle=dashed](0,0)(0,2.5)
@@ -730,7 +732,7 @@
\psline[linecolor=red]{|<->|}(-1.65,0.4)(-0.85,0.4)
\uput[90](-1.25,0.4){\textcolor{red}{\texttt{spacing}}}
}
-\rput(0,-2.5){%
+\rput(0,-2.5){
\psdot[linecolor=red](0,0)
\uput[-90](0,0){\textcolor{red}{\texttt{xc,yc}}}
\psline[linecolor=red](-3,0)(3,0)
@@ -768,15 +770,15 @@
\begin{center}
\begin{pspicture}(-5,-5)(5,5)
\psMarble[
-actions={%
+actions={
0 0 [-200 -100 0 100 200][-200 0 200 ] 0 colors 20 serpentine-drops
}
](10,10)
-\multido{\iA=-2+1}{5}{%
+\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}{%
+\multido{\iA=-2+2}{3}{
\psline[linecolor=red]{->}(3.5,\iA)(2.5,\iA)
}
\rput{90}(3.9,0){\color{red}\texttt{y-places}}
@@ -791,15 +793,15 @@
{\tiny\begin{verbatim}
\begin{pspicture}(-5,-5)(5,5)
\psMarble[
-actions={%
+actions={
0 0 [-200 -100 0 100 200][-200 0 200 ] 0 colors 20 serpentine-drops
}
](10,10)
-\multido{\iA=-2+1}{5}{%
+\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}{%
+\multido{\iA=-2+2}{3}{
\psline[linecolor=red]{->}(3.5,\iA)(2.5,\iA)
}
\rput{90}(3.9,0){\color{red}\texttt{y-places}}
@@ -826,7 +828,7 @@
\begin{center}
\begin{pspicture}(-5,-5)(5,5)
\psMarble[
-actions={%
+actions={
0 0 [5 100 0 tines][6 75 20 tines] 30 colors 50 serpentine-drops
}
](10,10)
@@ -839,7 +841,7 @@
\begin{verbatim}
\begin{pspicture}(-5,-5)(5,5)
\psMarble[
-actions={%
+actions={
0 0 [5 100 0 tines][6 75 20 tines] 30 colors 50 serpentine-drops
}
](10,10)
@@ -924,7 +926,7 @@
}]
\pscircle[linecolor=red](2,0){!1}\pscircle[linecolor=red](2,0){!1 2 sqrt mul}
\pscircle[linecolor=red](2,0){!1 2 mul}
-\rput{60}(-3,0){%
+\rput{60}(-3,0){
\psellipse[linecolor=red](0,0)(!1 2 mul 1 2 div)
\psline[linestyle=dashed,linecolor=red](!1 2 mul neg 0)(!1 2 mul 0)
\psline[linestyle=dashed,linecolor=red](!0 1 2 div neg)(!0 1 2 div)
@@ -949,7 +951,7 @@
}]
\pscircle[linecolor=red](2,0){!1}\pscircle[linecolor=red](2,0){!1 2 sqrt mul}
\pscircle[linecolor=red](2,0){!1 2 mul}
-\rput{60}(-3,0){%
+\rput{60}(-3,0){
\psellipse[linecolor=red](0,0)(!1 2 mul 1 2 div)
\psline[linestyle=dashed,linecolor=red](!1 2 mul neg 0)(!1 2 mul 0)
\psline[linestyle=dashed,linecolor=red](!0 1 2 div neg)(!0 1 2 div)
@@ -1076,7 +1078,7 @@
cx, cy Center coordinates
thick Thickness of the rings
count Number of rings
-color Array of colors: [[rgb/RGB][rgb/RGB]...[rgb/RGB]]
+color Array of colors: [[rgb][rgb]...[rgb]]
\end{verbatim}
\textbf{Example 1:}
@@ -1284,7 +1286,7 @@
The stylus parameter \texttt{D} (given in mm) is the ratio of its submerged volume to its wetted surface area. The bigger this value, the wider the area of points that are affected by the deformation.
\begin{center}
-\psscalebox{0.8}{%
+\psscalebox{0.8}{
\begin{pspicture*}(-5,-5)(5,5)
\psMarble[viscosity=1000,linewidth=0.1,bckg=false,drawcontours,
colors={[0 0 0]},
@@ -1342,7 +1344,7 @@
The stylus parameter \texttt{D} (given in mm) is set to 50 mm.
\begin{center}
-\psscalebox{0.8}{%
+\psscalebox{0.8}{
\begin{pspicture*}(-5,-5)(5,5)
\psMarble[viscosity=1000,linewidth=0.1,bckg=false,drawcontours,
colors={[0 0 0]},
@@ -1422,7 +1424,7 @@
[0.059 0.522 0.392]
[0.816 0.333 0.475]
},
-actions={%
+actions={
0 0 35 colors 32 concentric-rings
% rake with 11 teeth aligned 1 cm (= 100 pts) with no offset
0 [11 100 0 tines] 50 100 30 rake
@@ -1432,7 +1434,7 @@
colors={[1 1 1]},
bckg=false,
drawcontours,
-actions={%
+actions={
0 0 35 colors 32 concentric-rings
%% rake with 11 teeth aligned 1 cm (= 100 pts)
0 [11 100 0 tines] 50 100 30 rake
@@ -1454,7 +1456,7 @@
[0.059 0.522 0.392]
[0.816 0.333 0.475]
},
-actions={%
+actions={
0 0 35 colors 32 concentric-rings
% rake with 11 teeth aligned 1 cm (= 100 pts) with no offset
0 [11 100 0 tines] 50 100 30 rake
@@ -1464,7 +1466,7 @@
colors={[1 1 1]},
bckg=false,
drawcontours,
-actions={%
+actions={
0 0 35 colors 32 concentric-rings
%% rake with 11 teeth aligned 1 cm (= 100 pts)
0 [11 100 0 tines] 50 100 30 rake
@@ -1483,11 +1485,7 @@
\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{/stylus}: \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 stylus
@@ -1502,7 +1500,7 @@
\begin{center}
\begin{pspicture}(-5,-5)(5,5)
\psMarble[viscosity=250,
-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 stylus
@@ -1518,7 +1516,7 @@
{\small\begin{verbatim}
\begin{pspicture}(-5,-5)(5,5)
\psMarble[viscosity=250,
-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 stylus
@@ -1541,7 +1539,7 @@
\begin{center}
\begin{pspicture}(-5,-5)(5,5)
\psMarble[viscosity=250,
-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 stylus
@@ -1560,7 +1558,7 @@
{\small\begin{verbatim}
\begin{pspicture}(-5,-5)(5,5)
\psMarble[viscosity=250,
-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 stylus
@@ -1856,7 +1854,7 @@
begin={\begin{pspicture}(-5,-5)(5,5)},
end={\end{pspicture}}
]{5}% 5 image/s
-\multiframe{20}{rA=-3+0.65}{%
+\multiframe{20}{rA=-3+0.65}{
\psMarble[
colors={
(622e07)
@@ -1865,7 +1863,7 @@
(56410d)
(191504)
},
- actions={%
+ actions={
0 0 40 colors 30 concentric-rings
90 [3 400 24 tines] 40 200 31 rake
-90 [3 400 24 tines] 40 200 31 rake
@@ -1882,7 +1880,7 @@
begin={\begin{pspicture}(-5,-5)(5,5)},
end={\end{pspicture}}
]{5}% 5 image/s
-\multiframe{20}{rA=-3+0.65}{%
+\multiframe{20}{rA=-3+0.65}{
\psMarble[
colors={
(622e07)
@@ -1890,7 +1888,7 @@
(8f6e1d)
(56410d)
(191504)},
-actions={%
+actions={
0 0 40 colors 30 concentric-rings
90 [3 400 24 tines] 40 200 31 rake
-90 [3 400 24 tines] 40 200 31 rake
@@ -2006,6 +2004,13 @@
\subsection{\texttt{wiggle}}
This instruction simulates the action of an artist who with the tip of the stylus draws undulations on the surface of the liquid.
+
+\texttt{wiggle} affects the whole tank. In order to trace a wiggly rake in part of the tank, wiggle, then rake in part of the tank, then unwiggle
+(\texttt{wiggle} with negative depth).
+\begin{center}
+\url{http://people.csail.mit.edu/jaffer/Marbling/How-To}
+\end{center}
+demonstrates this.
\begin{verbatim}
angle period ofst depth wiggle
@@ -2121,7 +2126,7 @@
\begin{center}
\begin{pspicture}(-4,-4)(4,4)
\psMarble[
-actions={%
+actions={
0 0 50 colors 25 concentric-rings
0 1080 0 30 wiggle
0 1080 0 -30 wiggle % reverse action
@@ -2131,7 +2136,7 @@
{\small\begin{verbatim}
\begin{pspicture}(-4,-4)(4,4)
\psMarble[
-actions={%
+actions={
0 0 50 colors 25 concentric-rings
0 1080 0 30 wiggle
0 1080 0 -30 wiggle % reverse action
@@ -2162,10 +2167,10 @@
[0.730 0.965 0.942]
[0.040 0.236 0.424]
},
-actions={%
+actions={
0 0 43 colors 32 concentric-rings
30 300 shift}]
-\pstVerb{%
+\pstVerb{
/scaleFactor 10 1000 div def
/xS1 30 sin 300 mul scaleFactor mul def
/yS1 30 cos 300 mul scaleFactor mul def
@@ -2189,10 +2194,10 @@
[0.730 0.965 0.942]
[0.040 0.236 0.424]
},
-actions={%
+actions={
0 0 43 colors 32 concentric-rings
30 300 shift}]
-\pstVerb{%
+\pstVerb{
/scaleFactor 10 1000 div def
/xS1 30 sin 300 mul scaleFactor mul def
/yS1 30 cos 300 mul scaleFactor mul def
@@ -2226,7 +2231,7 @@
(78965b)
(a6a780)
},
-actions={%
+actions={
0 0 45 colors 26 concentric-rings
-30 150 shift
-100 20 140
@@ -2247,7 +2252,7 @@
(78965b)
(a6a780)
},
-actions={%
+actions={
0 0 45 colors 26 concentric-rings
-30 150 shift
-100 20 140
@@ -2400,7 +2405,7 @@
\begin{center}
\newpsstyle{YellowGlass}{linecolor=gray,linewidth=0.1}
-\newpsstyle{LensStyleHandle}{%
+\newpsstyle{LensStyleHandle}{
fillstyle=gradient,framearc=0.6,linewidth=0.5\pslinewidth,
gradmidpoint=0.5,gradangle=45,gradbegin=white,gradend=gray}
\begin{pspicture}(-5,-5)(5,5)
@@ -2425,13 +2430,13 @@
}}%
\psMarble(10,10)
\PstLens[LensMagnification=2,LensRotation=50,LensSize=2,LensShadow=false,%
-LensStyleGlass=YellowGlass](1,-1){%
+LensStyleGlass=YellowGlass](1,-1){
\psMarble(10,10)}
\end{pspicture}
\end{center}
{\small\begin{verbatim}
\newpsstyle{YellowGlass}{linecolor=gray,linewidth=0.1}
-\newpsstyle{LensStyleHandle}{%
+\newpsstyle{LensStyleHandle}{
fillstyle=gradient,framearc=0.6,linewidth=0.5\pslinewidth,
gradmidpoint=0.5,gradangle=45,gradbegin=white,gradend=gray}
\begin{pspicture}(-5,-5)(5,5)
@@ -2456,7 +2461,7 @@
}}%
\psMarble(10,10)
\PstLens[LensMagnification=2,LensRotation=50,LensSize=2,LensShadow=false,%
-LensStyleGlass=YellowGlass](1,-1){%
+LensStyleGlass=YellowGlass](1,-1){
\psMarble(10,10)}
\end{pspicture}
\end{verbatim}}
@@ -2470,7 +2475,7 @@
\begin{center}
\begin{pspicture}(-5,-5)(5,5)
\psMarble[viscosity=1000,background={[0.64 0.70 0.79]},
-actions={%
+actions={
11 -1 1
{
/rad exch sqrt 50 mul def
@@ -2497,7 +2502,7 @@
{\small\begin{verbatim}
\begin{pspicture}(-5,-5)(5,5)
\psMarble[viscosity=1000,background={[0.64 0.70 0.79]},
-actions={%
+actions={
11 -1 1
{
/rad exch sqrt 50 mul def
@@ -2866,12 +2871,12 @@
[ 128 78 46 ]
},
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
+ 0 0 1000 1000 0 [ 222 186 149 ] 85 1.72 10 mul uniform-drops
+ 0 0 1000 1000 0 colors 250 1.72 16 mul uniform-drops
+ 0 0 1000 1000 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}
@@ -2888,12 +2893,12 @@
[ 128 78 46 ]
},
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
+ 0 0 1000 1000 0 [ 222 186 149 ] 85 1.72 10 mul uniform-drops
+ 0 0 1000 1000 0 colors 250 1.72 16 mul uniform-drops
+ 0 0 1000 1000 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}
@@ -2938,13 +2943,16 @@
\begin{center}
\begin{pspicture}(-4,-4)(4,4)
-\psMarble[blendmode=5,shapealpha=1,viscosity=1000,
+\pstVerb{%
+[ /BM /Darken /ca 1 /CA 1 /SetTransparency pdfmark
+}
+\psMarble[viscosity=1000,
actions={
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[blendmode=5,shapealpha=1,viscosity=1000,bckg=false,
+\psMarble[viscosity=1000,bckg=false,
actions={
-300 92 500
{
@@ -3000,13 +3008,16 @@
\begin{center}
\begin{pspicture}(-4,-4)(4,4)
-\psMarble[opacity=0.35,viscosity=1000,
+\pstVerb{%
+[ /ca 0.35 /CA 0.35 /SetTransparency pdfmark
+}
+\psMarble[viscosity=1000,
actions={
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[opacity=0.35,viscosity=1000,bckg=false,
+\psMarble[viscosity=1000,bckg=false,
actions={
-300 92 500
{
@@ -3017,6 +3028,9 @@
0 0 [-350] 30 30 15 stir
0 0 [-150] 60 30 15 stir
}](8,8)
+\pstVerb{%
+[ /ca 1 /CA 1 /SetTransparency pdfmark
+}
\end{pspicture}
\end{center}
{\small\begin{verbatim}
@@ -3055,20 +3069,20 @@
Also many thanks to A. Grahn who sent a patch to use transparency and blendmode effects with the usual PSTricks options.
-\newpage
-
-
-\section{List of all optional arguments for \texttt{pst-marble}}
-
-\xkvview{family=pst-marble,columns={key,type,default}}
-
-\clearpage
-
-\nocite{*}
-\bgroup
-\RaggedRight
-\printbibliography
-\egroup
-
-\printindex
+%\newpage
+%
+%
+%\section{List of all optional arguments for \texttt{pst-marble}}
+%
+%\xkvview{family=pst-marble,columns={key,type,default}}
+%
+%\clearpage
+%
+%\nocite{*}
+%\bgroup
+%\RaggedRight
+%\printbibliography
+%\egroup
+%
+%\printindex
\end{document}
Modified: trunk/Master/texmf-dist/tex/generic/pst-marble/pst-marble.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pst-marble/pst-marble.tex 2019-02-23 22:17:17 UTC (rev 50101)
+++ trunk/Master/texmf-dist/tex/generic/pst-marble/pst-marble.tex 2019-02-23 22:17:40 UTC (rev 50102)
@@ -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 at 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.3}
-\def\filedate{2019/02/18}
+\def\fileversion{1.3a}
+\def\filedate{2019/02/23}
\message{`PST' v\fileversion, \filedate}
%
\pstheader{pst-marble.pro}
@@ -48,16 +48,16 @@
[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]
+ [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,
oversample=0,
@@ -65,6 +65,7 @@
drawcontours=false,
bckg=true
}%
+\psset[pstricks]{shapealpha=1}
\def\psMarble{\def\pst at par{}\pst at object{psMarble}}
\def\psMarble at i{\@ifnextchar({\psMarble at ii}{\psMarble at ii(10,10)}}
\def\psMarble at ii(#1,#2){%
@@ -71,8 +72,9 @@
\begin at SpecialObj
\addto at pscode{%
plotdict begin
-/FILL {\tx at setTransparency\space\tx at setBlendmode systemdict /fill get exec } def
-/STROKE {\pst at number\pslinewidth 1000 div SLW \tx at setStrokeTransparency\space\tx at setBlendmode systemdict /stroke get exec} def
+/FILL {\tx at setTransparency \tx at setBlendmode fill } def
+%/FILL {\tx at setTransparency fill } def
+/STROKE {\pst at number\pslinewidth 1000 div SLW \tx at setStrokeTransparency \tx at setBlendmode systemdict /stroke get exec} def
/cm {\pst at number\psunit mul } bind def
/background \pst at marble@background color-norm def
/colors [\pst at marble@colors] def
@@ -94,8 +96,8 @@
gsave
\ifPst at bckg
background aload pop setrgbcolor
-% lox loy pagewidth pageheight RECTFILL
- newpath lox loy moveto pagewidth 0 rlineto 0 pageheight rlineto pagewidth neg 0 rlineto closepath FILL
+ 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
marble
Modified: trunk/Master/texmf-dist/tex/latex/pst-marble/pst-marble.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pst-marble/pst-marble.sty 2019-02-23 22:17:17 UTC (rev 50101)
+++ trunk/Master/texmf-dist/tex/latex/pst-marble/pst-marble.sty 2019-02-23 22:17:40 UTC (rev 50102)
@@ -1,5 +1,5 @@
\RequirePackage{pstricks}
-\ProvidesPackage{pst-marble}[2019/02/18 package wrapper for PSTricks pst-marble.tex]
+\ProvidesPackage{pst-marble}[2019/02/23 package wrapper for PSTricks pst-marble.tex]
\input pst-marble.tex
\ProvidesFile{pst-marble.tex}
[\filedate\space v\fileversion\space `PST-marble']
@@ -6,6 +6,6 @@
\IfFileExists{pst-marble.pro}{
\ProvidesFile{pst-marble.pro}
- [2019-02-18 v. 1.3, PostScript prologue file]
+ [2019-02-23 v. 1.3a, PostScript prologue file]
\@addtofilelist{pst-marble.pro}}{}
\endinput
More information about the tex-live-commits
mailing list