updated to use my new classes for making classes with Pd

svn path=/trunk/externals/mapping/; revision=4520

5 files changed, 113 insertions, 103 deletions

diff --git a/disjoin.pd b/disjoin.pd
index a74cf43..2892db6 100644
--- a/disjoin.pd
+++ b/disjoin.pd
@@ -1,27 +1,30 @@
-#N canvas 0 22 454 304 10;
+#N canvas 100 164 458 308 10;
 #X obj 62 28 inlet;
-#X obj 62 53 moses \$1;
-#X obj 62 204 outlet;
-#X obj 113 203 outlet;
-#X obj 62 100 / \$1;
-#X obj 152 27 inlet;
-#X obj 113 101 - \$1;
-#X obj 177 83 t b f;
-#X obj 161 63 loadbang;
-#X obj 113 158 / 1;
-#X msg 177 105 1;
-#X obj 177 129 - \$1;
-#X connect 0 0 1 0;
-#X connect 1 0 4 0;
-#X connect 1 1 6 0;
-#X connect 4 0 2 0;
-#X connect 5 0 4 1;
-#X connect 5 0 6 1;
-#X connect 5 0 7 0;
-#X connect 6 0 9 0;
-#X connect 7 0 10 0;
-#X connect 7 1 11 1;
-#X connect 8 0 10 0;
+#X obj 62 244 outlet;
+#X obj 113 243 outlet;
+#X obj 113 198 / 1;
+#X msg 167 145 1;
+#X obj 162 48 float_argument \$1;
+#X obj 277 27 inlet;
+#X obj 162 27 loadbang;
+#X obj 167 169 -;
+#X obj 113 141 -;
+#X obj 62 140 /;
+#X obj 62 83 moses;
+#X obj 167 123 trigger bang float;
+#X connect 0 0 11 0;
+#X connect 3 0 2 0;
+#X connect 4 0 8 0;
+#X connect 5 0 9 1;
+#X connect 5 0 10 1;
+#X connect 5 0 11 1;
+#X connect 5 0 12 0;
+#X connect 6 0 5 1;
+#X connect 7 0 5 0;
+#X connect 8 0 3 1;
 #X connect 9 0 3 0;
-#X connect 10 0 11 0;
-#X connect 11 0 9 1;
+#X connect 10 0 1 0;
+#X connect 11 0 10 0;
+#X connect 11 1 9 0;
+#X connect 12 0 4 0;
+#X connect 12 1 8 1;
diff --git a/help/disjoin-help.pd b/help/disjoin-help.pd
index eb8c71f..136abad 100644
--- a/help/disjoin-help.pd
+++ b/help/disjoin-help.pd
@@ -1,12 +1,12 @@
-#N canvas 759 140 610 671 10;
+#N canvas 299 61 346 576 10;
 #X obj 33 34 vsl 15 128 0 1 0 0 empty empty empty 0 -8 0 8 -262144
--1 -1 0 1;
+-1 -1 11300 1;
 #X obj 33 205 vsl 15 128 0 1 0 0 empty empty empty 0 -8 0 8 -262144
--1 -1 0 1;
+-1 -1 12000 1;
 #X obj 112 205 vsl 15 128 0 1 0 0 empty empty empty 0 -8 0 8 -262144
--1 -1 0 1;
+-1 -1 10700 1;
 #X obj 33 396 vsl 15 128 0 1 0 0 empty empty empty 0 -8 0 8 -262144
--1 -1 0 1;
+-1 -1 11300 1;
 #X floatatom 134 339 5 0 0 0 - - -;
 #X obj 33 175 disjoin 0.3;
 #X obj 33 364 join 0.3;
diff --git a/join.pd b/join.pd
index 79c8b80..5911566 100644
--- a/join.pd
+++ b/join.pd
@@ -1,25 +1,27 @@
-#N canvas 492 503 452 397 10;
-#X obj 32 24 inlet;
-#X obj 78 25 inlet;
-#X obj 125 25 inlet;
-#X obj 32 215 outlet;
-#X obj 125 71 t b f;
-#X obj 142 48 loadbang;
-#X msg 125 93 1;
-#X obj 125 117 - \$1;
-#X obj 78 180 + \$1;
-#X obj 32 119 * \$1;
-#X obj 78 153 *;
+#N canvas 248 251 319 292 10;
+#X obj 32 14 inlet;
+#X obj 78 14 inlet;
+#X obj 32 245 outlet;
+#X obj 145 91 t b f;
+#X msg 145 113 1;
+#X obj 78 169 *;
+#X obj 135 55 float_argument \$1;
+#X obj 249 16 inlet;
+#X obj 135 36 loadbang;
+#X obj 32 149 *;
+#X obj 78 210 +;
+#X obj 145 137 -;
 #X connect 0 0 9 0;
-#X connect 1 0 10 0;
-#X connect 2 0 4 0;
-#X connect 2 0 8 1;
-#X connect 2 0 9 1;
-#X connect 4 0 6 0;
-#X connect 4 1 7 1;
-#X connect 5 0 6 0;
-#X connect 6 0 7 0;
-#X connect 7 0 10 1;
-#X connect 8 0 3 0;
-#X connect 9 0 3 0;
-#X connect 10 0 8 0;
+#X connect 1 0 5 0;
+#X connect 3 0 4 0;
+#X connect 3 1 11 1;
+#X connect 4 0 11 0;
+#X connect 5 0 10 0;
+#X connect 6 0 3 0;
+#X connect 6 0 9 1;
+#X connect 6 0 10 1;
+#X connect 7 0 6 1;
+#X connect 8 0 6 0;
+#X connect 9 0 2 0;
+#X connect 10 0 2 0;
+#X connect 11 0 5 1;
diff --git a/pd/disjoin.pd b/pd/disjoin.pd
index a74cf43..2892db6 100644
--- a/pd/disjoin.pd
+++ b/pd/disjoin.pd
@@ -1,27 +1,30 @@
-#N canvas 0 22 454 304 10;
+#N canvas 100 164 458 308 10;
 #X obj 62 28 inlet;
-#X obj 62 53 moses \$1;
-#X obj 62 204 outlet;
-#X obj 113 203 outlet;
-#X obj 62 100 / \$1;
-#X obj 152 27 inlet;
-#X obj 113 101 - \$1;
-#X obj 177 83 t b f;
-#X obj 161 63 loadbang;
-#X obj 113 158 / 1;
-#X msg 177 105 1;
-#X obj 177 129 - \$1;
-#X connect 0 0 1 0;
-#X connect 1 0 4 0;
-#X connect 1 1 6 0;
-#X connect 4 0 2 0;
-#X connect 5 0 4 1;
-#X connect 5 0 6 1;
-#X connect 5 0 7 0;
-#X connect 6 0 9 0;
-#X connect 7 0 10 0;
-#X connect 7 1 11 1;
-#X connect 8 0 10 0;
+#X obj 62 244 outlet;
+#X obj 113 243 outlet;
+#X obj 113 198 / 1;
+#X msg 167 145 1;
+#X obj 162 48 float_argument \$1;
+#X obj 277 27 inlet;
+#X obj 162 27 loadbang;
+#X obj 167 169 -;
+#X obj 113 141 -;
+#X obj 62 140 /;
+#X obj 62 83 moses;
+#X obj 167 123 trigger bang float;
+#X connect 0 0 11 0;
+#X connect 3 0 2 0;
+#X connect 4 0 8 0;
+#X connect 5 0 9 1;
+#X connect 5 0 10 1;
+#X connect 5 0 11 1;
+#X connect 5 0 12 0;
+#X connect 6 0 5 1;
+#X connect 7 0 5 0;
+#X connect 8 0 3 1;
 #X connect 9 0 3 0;
-#X connect 10 0 11 0;
-#X connect 11 0 9 1;
+#X connect 10 0 1 0;
+#X connect 11 0 10 0;
+#X connect 11 1 9 0;
+#X connect 12 0 4 0;
+#X connect 12 1 8 1;
diff --git a/pd/join.pd b/pd/join.pd
index 79c8b80..5911566 100644
--- a/pd/join.pd
+++ b/pd/join.pd
@@ -1,25 +1,27 @@
-#N canvas 492 503 452 397 10;
-#X obj 32 24 inlet;
-#X obj 78 25 inlet;
-#X obj 125 25 inlet;
-#X obj 32 215 outlet;
-#X obj 125 71 t b f;
-#X obj 142 48 loadbang;
-#X msg 125 93 1;
-#X obj 125 117 - \$1;
-#X obj 78 180 + \$1;
-#X obj 32 119 * \$1;
-#X obj 78 153 *;
+#N canvas 248 251 319 292 10;
+#X obj 32 14 inlet;
+#X obj 78 14 inlet;
+#X obj 32 245 outlet;
+#X obj 145 91 t b f;
+#X msg 145 113 1;
+#X obj 78 169 *;
+#X obj 135 55 float_argument \$1;
+#X obj 249 16 inlet;
+#X obj 135 36 loadbang;
+#X obj 32 149 *;
+#X obj 78 210 +;
+#X obj 145 137 -;
 #X connect 0 0 9 0;
-#X connect 1 0 10 0;
-#X connect 2 0 4 0;
-#X connect 2 0 8 1;
-#X connect 2 0 9 1;
-#X connect 4 0 6 0;
-#X connect 4 1 7 1;
-#X connect 5 0 6 0;
-#X connect 6 0 7 0;
-#X connect 7 0 10 1;
-#X connect 8 0 3 0;
-#X connect 9 0 3 0;
-#X connect 10 0 8 0;
+#X connect 1 0 5 0;
+#X connect 3 0 4 0;
+#X connect 3 1 11 1;
+#X connect 4 0 11 0;
+#X connect 5 0 10 0;
+#X connect 6 0 3 0;
+#X connect 6 0 9 1;
+#X connect 6 0 10 1;
+#X connect 7 0 6 1;
+#X connect 8 0 6 0;
+#X connect 9 0 2 0;
+#X connect 10 0 2 0;
+#X connect 11 0 5 1;