unified "array" and "struct array" code. Vast changes to "g_array.c" and

"g_template.c", and many smaller changes to various files.   Not yet
well tested.

svn path=/trunk/; revision=2341

3 files changed, 34 insertions, 30 deletions

diff --git a/pd/doc/1.manual/x3.htm b/pd/doc/1.manual/x3.htm
index f23e09a6..5f4f178f 100644
--- a/pd/doc/1.manual/x3.htm
+++ b/pd/doc/1.manual/x3.htm
@@ -457,10 +457,10 @@ distribution (10.2) or later.
 <P> To install Pd you can always just download 
 the sources and compile them yourself, or (easier) 
 find a MacOSX-style "package".  The first package was put together by Adam 
-Lindsay; the most current one seems to be the one by Hans
+Lindsay; the most current one is by Hans-Christof Steiner
 on
-<A href="http://www.pure-data.info/Members/hans/">
-http://www.pure-data.info/Members/hans/</A>.
+<A http://puredata.info/Members/hans">
+http://puredata.info/Members/hans</A>.
 The package simply installs itself 
 and you needn't follow the directions below. 
 </P>
diff --git a/pd/doc/5.reference/plot-help.pd b/pd/doc/5.reference/plot-help.pd
index 2070ed69..050418d2 100644
--- a/pd/doc/5.reference/plot-help.pd
+++ b/pd/doc/5.reference/plot-help.pd
@@ -5,33 +5,36 @@ array array2 help-plot-array2-template array array3 help-plot-array3-template
 #N struct help-plot-array2-template float x float y;
 #N struct help-plot-array3-template float y float w;
 #N canvas 398 0 516 229 12;
-#N canvas 173 285 626 539 help-plot-template 1;
-#X text 29 34 creation arguments:;
-#X text 48 71 - RGB color (0=black \, 999=white \, 900=red \, 90=green
+#N canvas 288 75 606 588 help-plot-template 1;
+#X text 35 30 creation arguments:;
+#X text 51 48 - RGB color (0=black \, 999=white \, 900=red \, 90=green
 \, 9=blue \, 555=grey \, etc.);
-#X text 47 52 - OPTIONAL word "curve" to specify bezier;
-#X text 46 98 - line width;
-#X text 46 114 - relative x and y location;
-#X text 47 130 - x spacing;
-#X obj 39 217 plot curve array2 70 3 100 0;
-#X obj 30 308 plot curve array3 9 1 120 50 20;
-#X obj 45 12 plot array1 500 1 10 15 20;
-#X text 29 147 This first example plots the red trace (500) \, width
+#X text 50 97 - relative x and y location;
+#X text 50 114 - x spacing;
+#X text 40 150 This first example plots the red trace (500) \, width
 1 \, at point (10 \, 15) \, with horizontal spacing 20 The black diamonds
 come from the template of the array1 element itself.;
-#X text 62 239 This is the green spiral (color 70 \, line width 3 \,
-location (100 \, 0). Since the template for array2 contains an "x"
-cariable \, play ignores x spacing requests and takes x from the data
-itself.;
-#X text 50 328 If a "w" variable is present in the template as for
+#X text 44 327 If a "w" variable is present in the template as for
 array3 \, it is added to the line width.;
-#X obj 27 501 filledpolygon 509 509 0 -10 -10 10 -10 10 10 -10 10;
-#X text 27 454 To see the data itself \, select "properties" for the
+#X obj 37 493 filledpolygon 509 509 0 -10 -10 10 -10 10 10 -10 10;
+#X text 34 454 To see the data itself \, select "properties" for the
 scalar by right clicking on the purple square.;
-#X obj 24 387 struct help-plot-template float x float y array array1
+#X obj 36 390 struct help-plot-template float x float y array array1
 help-plot-array1-template array array2 help-plot-array2-template array
 array3 help-plot-array3-template;
-#X text 33 366 here's the "struct" for all this:;
+#X text 45 369 here's the "struct" for all this:;
+#X obj 51 8 plot array1 500 1 10 15 20 1;
+#X obj 39 217 plot array2 70 3 100 0 0 2;
+#X text 30 542 obsolete feature: the arguments can be preceded by the
+word "curve" to specify bezier curves. This will be phased out.;
+#X text 52 80 - line width in pixels;
+#X text 51 130 - style (0 for points \, 1 for polygon \, 2 for Bezier
+curve);
+#X text 40 236 This is the green spiral (color 70 \, line width 3 \,
+location (100 \, 0). Since the template for array2 contains an "x"
+cariable \, play ignores x spacing requests and takes x from the data
+itself. The style is 2 for a Bezier curve.;
+#X obj 43 309 plot array3 9 1 120 50 20 1;
 #X restore 243 78 pd help-plot-template;
 #N canvas 196 292 273 120 help-plot-array1-template 0;
 #X obj 30 71 filledpolygon 0 0 0 -5 0 0 5 5 0 0 -5;
diff --git a/pd/doc/7.stuff/data-structures/5.array.pd b/pd/doc/7.stuff/data-structures/5.array.pd
index 234d039d..9f11e17c 100644
--- a/pd/doc/7.stuff/data-structures/5.array.pd
+++ b/pd/doc/7.stuff/data-structures/5.array.pd
@@ -13,15 +13,15 @@
 #X obj 318 163 pointer;
 #X msg 449 194 bang;
 #N canvas 0 0 384 196 data5 1;
-#X scalar template5 50 150 30 9 \; 0 \; 0 \; 0 \; 0 \; 0 \; 3 \; 0
-\; 0 \; 0 \; 7 \; -30 \; 0 \; 0 \; 0 \; 0 \; 0 \; 0 \; 0 \; 0 \; 0
-\; 0 \; 0 \; 0 \; 0 \; 0 \; 0 \; 0 \; 0 \; 0 \; 0 \; 0 \; 0 \; 0 \;
-0 \; 0 \; 0 \; 0 \; 0 \; 0 \; 0 \; 0 \; 0 \; 0 \; 0 \; 0 \; 43 \; 0
-\; 0 \; 0 \; 0 \; \;;
+#X scalar template5 50 150 30 9 \; 6 \; 10 \; 12 \; 14 \; 20 \; 26
+\; 32 \; 31 \; 26 \; 26 \; 23 \; 19 \; 15 \; 11 \; 7 \; 5 \; -55 \;
+-56 \; -58 \; -1 \; -1 \; -6 \; -7 \; -8 \; -10 \; -11.3333 \; -12.6667
+\; -14 \; -18 \; -20 \; -22 \; -24 \; -26 \; -28 \; -31 \; -35 \; -37
+\; -37 \; -37 \; -37 \; -38 \; -39 \; -40 \; -41 \; -42 \; -43 \; -47
+\; -49 \; -51 \; -52 \; \;;
 #X restore 508 314 pd data5;
-#N canvas 5 272 646 260 template5 1;
+#N canvas 90 339 646 260 template5 1;
 #X obj 8 91 filledpolygon 244 q 3 0 0 20 z 40 0;
-#X obj 8 113 plot bazoo 700 3 30 10 4;
 #X text 6 44 this declares an array named "bazoo" whose elements are
 described by "template5-element." Array declarations take three arguments
 while "float" declarations take only two.;
@@ -32,6 +32,7 @@ spaced 4 apart.;
 variable---see the help window for "plot".;
 #X obj 6 8 struct template5 float x float y float z float q array bazoo
 template5-element;
+#X obj 8 113 plot bazoo 700 3 30 10 4 1;
 #X restore 508 337 pd template5;
 #N canvas 65 248 568 128 template5-element 0;
 #X text 12 36 This says that array elements will have a single floating-point