- QA'ed tutorial patches to make sure that the objects all load, and that the

  patches are all the same size and location


svn path=/trunk/; revision=10034

13 files changed, 138 insertions, 187 deletions

diff --git a/doc/tutorials/networking/01.netsend_netreceive.pd b/doc/tutorials/networking/01.netsend_netreceive.pd
deleted file mode 100644
index 456ebd83..00000000
--- a/doc/tutorials/networking/01.netsend_netreceive.pd
+++ /dev/null
@@ -1,36 +0,0 @@
-#N canvas 15 58 632 452 10;
-#X obj 8 10 cnv 15 400 40 empty empty netsend_netreceive 20 12 0 24
--228992 -66577 0;
-#X obj 56 181 send \$0-local-data;
-#X obj 56 292 receive \$0-local-data;
-#X obj 60 144 hsl 150 20 0 127 0 0 empty empty empty -2 -6 0 8 -225271
--1 -1 7600 1;
-#X obj 59 331 hsl 150 20 0 127 0 0 empty empty empty -2 -6 0 8 -262144
--1 -1 7600 1;
-#X obj 311 144 hsl 150 20 0 127 0 0 empty empty empty -2 -6 0 8 -225280
--1 -1 1400 1;
-#X obj 311 331 hsl 150 20 0 127 0 0 empty empty empty -2 -6 0 8 -262144
--1 -1 1400 1;
-#X obj 308 231 netsend;
-#X obj 308 291 netreceive 34567;
-#X msg 326 192 connect localhost 34567;
-#X obj 308 250 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1
-1;
-#X obj 415 310 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1
-1;
-#X text 329 249 <-- connection status;
-#X text 433 310 <-- connection status;
-#X msg 327 211 disconnect;
-#X msg 308 169 send \$1;
-#X text 45 78 At the most basic level \, networking in Pd works a lot
-like the standard [send] and [receive] objects \, except there is a
-network port number rather than a send/receive name:;
-#X connect 2 0 4 0;
-#X connect 3 0 1 0;
-#X connect 5 0 15 0;
-#X connect 7 0 10 0;
-#X connect 8 0 6 0;
-#X connect 8 1 11 0;
-#X connect 9 0 7 0;
-#X connect 14 0 7 0;
-#X connect 15 0 7 0;
diff --git a/doc/tutorials/networking/01.network_ports.pd b/doc/tutorials/networking/01.network_ports.pd
index e430efa5..fa7e94f7 100644
--- a/doc/tutorials/networking/01.network_ports.pd
+++ b/doc/tutorials/networking/01.network_ports.pd
@@ -1,4 +1,4 @@
-#N canvas 16 37 648 468 10;
+#N canvas 10 40 620 460 10;
 #X obj 8 10 cnv 15 400 40 empty empty network_ports 20 12 0 24 -228992
 -66577 0;
 #X obj 49 418 pddp/pddplink http://en.wikipedia.org/wiki/TCP_and_UDP_port
diff --git a/doc/tutorials/networking/02.netsend_netreceive.pd b/doc/tutorials/networking/02.netsend_netreceive.pd
index 2cdb37e8..5e1df40a 100644
--- a/doc/tutorials/networking/02.netsend_netreceive.pd
+++ b/doc/tutorials/networking/02.netsend_netreceive.pd
@@ -1,4 +1,4 @@
-#N canvas 15 58 636 456 10;
+#N canvas 10 40 620 460 10;
 #X obj 8 10 cnv 15 400 40 empty empty netsend_netreceive 20 12 0 24
 -228992 -66577 0;
 #X obj 56 211 send \$0-local-data;
diff --git a/doc/tutorials/networking/02.tcp_and_udp.pd b/doc/tutorials/networking/02.tcp_and_udp.pd
deleted file mode 100644
index 514cf849..00000000
--- a/doc/tutorials/networking/02.tcp_and_udp.pd
+++ /dev/null
@@ -1,31 +0,0 @@
-#N canvas 185 93 644 464 10;
-#X obj 511 62 import maxlib;
-#X obj 10 10 cnv 15 400 40 empty empty tcp_and_udp 20 12 0 24 -228992
--66577 0;
-#X text 11 66 There are two main protocols for transmitting data over
-networks: TCP and UDP.;
-#X text 35 119 TCP is the most common \, it stands for Transmission
-Control Protocol. Basically \, that means that the protocol manages
-the transmission of the data. With TCP \, when you send a packet of
-data \, its guaranteed to arrive.;
-#X text 34 202 By default \, most networking objects in Pd use TCP:
-;
-#X obj 54 223 netsend;
-#X obj 266 224 netclient;
-#X obj 359 224 netserver;
-#X text 178 295 UDP stands for User Datagram Protocol. It is a lightweight
-\, simple protocol that is meant to be as quick and small as possible.
-The downside is that the data packets are not guaranteed to arrive.
-;
-#X obj 35 180 pddp/pddplink http://en.wikipedia.org/wiki/Transmission_Control_Protocol
-;
-#X obj 177 355 pddp/pddplink http://en.wikipedia.org/wiki/User_Datagram_Protocol
-;
-#X obj 132 224 netreceive 32194;
-#X obj 265 386 netreceive 32194 1;
-#X obj 187 386 netsend 1;
-#X obj 407 386 sendOSC;
-#X obj 478 386 dumpOSC 32192;
-#X text 180 409 One advantage to UDP is that you do not need to maintain
-a connection to receive data. Whenever you open a UDP port \, you will
-start receiving data.;
diff --git a/doc/tutorials/networking/03.tcp_and_udp.pd b/doc/tutorials/networking/03.tcp_and_udp.pd
index b301525f..3d2ad90d 100644
--- a/doc/tutorials/networking/03.tcp_and_udp.pd
+++ b/doc/tutorials/networking/03.tcp_and_udp.pd
@@ -1,5 +1,6 @@
-#N canvas 185 93 648 468 10;
-#X obj 511 62 import maxlib;
+#N canvas 10 40 620 460 10;
+#X declare -lib libdir;
+#X obj 440 65 import maxlib oscx mrpeach;
 #X obj 10 10 cnv 15 400 40 empty empty tcp_and_udp 20 12 0 24 -228992
 -66577 0;
 #X text 11 66 There are two main protocols for transmitting data over
@@ -13,19 +14,23 @@ data \, its guaranteed to arrive.;
 #X obj 54 223 netsend;
 #X obj 266 224 netclient;
 #X obj 359 224 netserver;
-#X text 178 285 UDP stands for User Datagram Protocol. It is a lightweight
+#X text 178 265 UDP stands for User Datagram Protocol. It is a lightweight
 \, simple protocol that is meant to be as quick and small as possible.
 The downside is that the data packets are not guaranteed to arrive.
 ;
 #X obj 35 180 pddp/pddplink http://en.wikipedia.org/wiki/Transmission_Control_Protocol
 ;
-#X obj 177 345 pddp/pddplink http://en.wikipedia.org/wiki/User_Datagram_Protocol
+#X obj 177 325 pddp/pddplink http://en.wikipedia.org/wiki/User_Datagram_Protocol
 ;
 #X obj 132 224 netreceive 32194;
-#X obj 265 376 netreceive 32194 1;
-#X obj 187 376 netsend 1;
-#X obj 407 376 sendOSC;
-#X obj 478 376 dumpOSC 32192;
+#X obj 305 356 netreceive 32194 1;
+#X obj 227 356 netsend 1;
+#X obj 447 356 sendOSC;
+#X obj 518 356 dumpOSC 32192;
 #X text 180 399 One advantage to UDP is that you do not need to maintain
 a connection to receive data. Whenever you open a UDP port \, you will
 start receiving data.;
+#X obj 442 224 tcpclient;
+#X obj 525 224 tcpserver;
+#X obj 143 356 udpreceive;
+#X obj 70 356 udpsend;
diff --git a/doc/tutorials/networking/04.netserver_and_netclient.pd b/doc/tutorials/networking/04.netserver_and_netclient.pd
index ed64101a..92d431a0 100644
--- a/doc/tutorials/networking/04.netserver_and_netclient.pd
+++ b/doc/tutorials/networking/04.netserver_and_netclient.pd
@@ -1,4 +1,6 @@
-#N canvas 15 58 644 464 10;
+#N canvas 10 40 620 460 10;
+#X declare -lib libdir;
+#X obj 463 52 import maxlib;
 #X obj 8 10 cnv 15 400 40 empty empty netserver_and_netclient 20 12
 0 24 -228992 -66577 0;
 #X floatatom 61 243 5 0 0 0 - - -;
@@ -33,20 +35,20 @@
 #X text 13 71 [netserver] and [netclient] gives you a bi-directional
 connection so you can send data back and forth thru it. Also \, [netserver]
 helps you manage multiple connections.;
-#X connect 6 0 24 0;
-#X connect 6 1 8 0;
-#X connect 7 0 6 0;
-#X connect 9 0 6 0;
-#X connect 10 0 14 0;
-#X connect 10 1 12 0;
-#X connect 11 0 10 0;
-#X connect 13 0 10 0;
-#X connect 15 0 9 0;
-#X connect 16 0 13 0;
-#X connect 17 0 1 0;
-#X connect 17 1 2 0;
-#X connect 17 2 4 0;
-#X connect 17 3 3 0;
-#X connect 18 0 6 0;
-#X connect 19 0 10 0;
-#X connect 20 0 17 0;
+#X connect 7 0 25 0;
+#X connect 7 1 9 0;
+#X connect 8 0 7 0;
+#X connect 10 0 7 0;
+#X connect 11 0 15 0;
+#X connect 11 1 13 0;
+#X connect 12 0 11 0;
+#X connect 14 0 11 0;
+#X connect 16 0 10 0;
+#X connect 17 0 14 0;
+#X connect 18 0 2 0;
+#X connect 18 1 3 0;
+#X connect 18 2 5 0;
+#X connect 18 3 4 0;
+#X connect 19 0 7 0;
+#X connect 20 0 11 0;
+#X connect 21 0 18 0;
diff --git a/doc/tutorials/networking/05.OSC.pd b/doc/tutorials/networking/05.OSC.pd
index 77ab8e07..1a1872d0 100644
--- a/doc/tutorials/networking/05.OSC.pd
+++ b/doc/tutorials/networking/05.OSC.pd
@@ -1,4 +1,6 @@
-#N canvas 115 56 644 464 10;
+#N canvas 10 40 620 460 10;
+#X declare -lib libdir;
+#X obj 493 25 import oscx;
 #X obj 8 10 cnv 15 400 40 empty empty OSC 20 12 0 24 -228992 -66577
 0;
 #X obj 80 298 sendOSC;
@@ -25,19 +27,19 @@ designed to replace MIDI \, but it has caught on instead for inter-application
 communication.;
 #X text 21 361 On the most basic level \, it works very similarly to
 [netsend] and [netreceive].;
-#X connect 1 0 2 0;
-#X connect 1 1 4 0;
-#X connect 3 0 1 0;
-#X connect 5 0 1 0;
-#X connect 6 0 5 0;
-#X connect 7 0 10 0;
-#X connect 10 0 1 0;
-#X connect 11 0 15 0;
-#X connect 12 0 1 0;
-#X connect 13 0 14 0;
-#X connect 14 0 1 0;
-#X connect 15 0 8 0;
-#X connect 15 0 9 0;
-#X connect 15 1 16 0;
-#X connect 15 1 18 0;
-#X connect 15 2 17 0;
+#X connect 2 0 3 0;
+#X connect 2 1 5 0;
+#X connect 4 0 2 0;
+#X connect 6 0 2 0;
+#X connect 7 0 6 0;
+#X connect 8 0 11 0;
+#X connect 11 0 2 0;
+#X connect 12 0 16 0;
+#X connect 13 0 2 0;
+#X connect 14 0 15 0;
+#X connect 15 0 2 0;
+#X connect 16 0 9 0;
+#X connect 16 0 10 0;
+#X connect 16 1 17 0;
+#X connect 16 1 19 0;
+#X connect 16 2 18 0;
diff --git a/doc/tutorials/networking/06.routing_OSC.pd b/doc/tutorials/networking/06.routing_OSC.pd
index c858a17f..8c8a5a3f 100644
--- a/doc/tutorials/networking/06.routing_OSC.pd
+++ b/doc/tutorials/networking/06.routing_OSC.pd
@@ -1,4 +1,6 @@
-#N canvas 158 45 644 464 10;
+#N canvas 10 40 620 460 10;
+#X declare -lib libdir;
+#X obj 470 51 import oscx;
 #X obj 8 10 cnv 15 400 40 empty empty routing_OSC 20 12 0 24 -228992
 -66577 0;
 #X text 13 61 OSC messages have two parts \, the identifier and the
@@ -31,21 +33,21 @@ with a / and patterns starting with a number.;
 #X msg 204 375 test/message data;
 #X msg 42 376 /test/message data;
 #X obj 165 413 OSCroute /test;
-#X connect 2 0 3 0;
-#X connect 2 0 4 0;
+#X connect 3 0 4 0;
 #X connect 3 0 5 0;
-#X connect 3 0 11 0;
-#X connect 5 0 6 0;
-#X connect 7 0 8 0;
-#X connect 9 0 10 0;
-#X connect 9 0 14 0;
-#X connect 10 0 7 0;
+#X connect 4 0 6 0;
+#X connect 4 0 12 0;
+#X connect 6 0 7 0;
+#X connect 8 0 9 0;
+#X connect 10 0 11 0;
 #X connect 10 0 15 0;
-#X connect 12 0 2 0;
-#X connect 13 0 9 0;
-#X connect 16 0 2 0;
-#X connect 17 0 9 0;
-#X connect 21 0 23 0;
-#X connect 22 0 23 0;
-#X connect 23 0 19 0;
-#X connect 23 1 20 0;
+#X connect 11 0 8 0;
+#X connect 11 0 16 0;
+#X connect 13 0 3 0;
+#X connect 14 0 10 0;
+#X connect 17 0 3 0;
+#X connect 18 0 10 0;
+#X connect 22 0 24 0;
+#X connect 23 0 24 0;
+#X connect 24 0 20 0;
+#X connect 24 1 21 0;
diff --git a/doc/tutorials/networking/07.matching_with_wildcards.pd b/doc/tutorials/networking/07.matching_with_wildcards.pd
index 4174b967..612e8070 100644
--- a/doc/tutorials/networking/07.matching_with_wildcards.pd
+++ b/doc/tutorials/networking/07.matching_with_wildcards.pd
@@ -1,4 +1,6 @@
-#N canvas 129 112 644 464 10;
+#N canvas 10 40 620 460 10;
+#X declare -lib libdir;
+#X obj 477 26 import oscx;
 #X obj 8 10 cnv 15 400 40 empty empty matching_with_wildcards 20 12
 0 24 -228992 -66577 0;
 #X text 10 69 OSC gives you a very useful feature which regular [route]
@@ -27,17 +29,17 @@ The * is the most common \, it means match any amount of any character:
 #X obj 202 388 OSCroute /note;
 #X obj 202 410 symbol;
 #X symbolatom 202 432 10 0 0 0 - - -;
-#X connect 4 0 5 0;
-#X connect 5 0 2 0;
-#X connect 5 1 3 0;
-#X connect 6 0 5 0;
-#X connect 7 0 5 0;
-#X connect 10 0 13 0;
-#X connect 11 0 13 0;
-#X connect 12 0 13 0;
-#X connect 13 0 17 0;
-#X connect 13 1 15 0;
-#X connect 14 0 13 0;
-#X connect 17 0 18 0;
-#X connect 17 1 16 0;
+#X connect 5 0 6 0;
+#X connect 6 0 3 0;
+#X connect 6 1 4 0;
+#X connect 7 0 6 0;
+#X connect 8 0 6 0;
+#X connect 11 0 14 0;
+#X connect 12 0 14 0;
+#X connect 13 0 14 0;
+#X connect 14 0 18 0;
+#X connect 14 1 16 0;
+#X connect 15 0 14 0;
 #X connect 18 0 19 0;
+#X connect 18 1 17 0;
+#X connect 19 0 20 0;
diff --git a/doc/tutorials/networking/08.wildcard_messages.pd b/doc/tutorials/networking/08.wildcard_messages.pd
index 0f13f8d7..83e41f6e 100644
--- a/doc/tutorials/networking/08.wildcard_messages.pd
+++ b/doc/tutorials/networking/08.wildcard_messages.pd
@@ -1,4 +1,6 @@
-#N canvas 235 112 656 476 10;
+#N canvas 10 40 620 460 10;
+#X declare -lib libdir;
+#X obj 468 43 import oscx;
 #X obj 8 10 cnv 15 400 40 empty empty wildcard_messages 20 12 0 24
 -228992 -66577 0;
 #X text 300 212 <-- notice the * in the pattern;
@@ -29,21 +31,21 @@ in the messages that you are sending. In this example \, the wildcard
 allows one message to reach three instruments:;
 #X msg 220 250 /inst4/note F;
 #X text 322 249 <-- there is no /inst4 in [OSCroute];
-#X connect 2 0 8 0;
-#X connect 3 0 8 0;
-#X connect 4 0 8 0;
-#X connect 6 0 7 0;
-#X connect 7 0 17 0;
-#X connect 8 0 10 0;
-#X connect 8 1 13 0;
-#X connect 8 2 16 0;
-#X connect 8 3 5 0;
-#X connect 9 0 8 0;
-#X connect 10 0 6 0;
-#X connect 11 0 12 0;
-#X connect 12 0 18 0;
-#X connect 13 0 11 0;
-#X connect 14 0 15 0;
-#X connect 15 0 19 0;
-#X connect 16 0 14 0;
-#X connect 21 0 8 0;
+#X connect 3 0 9 0;
+#X connect 4 0 9 0;
+#X connect 5 0 9 0;
+#X connect 7 0 8 0;
+#X connect 8 0 18 0;
+#X connect 9 0 11 0;
+#X connect 9 1 14 0;
+#X connect 9 2 17 0;
+#X connect 9 3 6 0;
+#X connect 10 0 9 0;
+#X connect 11 0 7 0;
+#X connect 12 0 13 0;
+#X connect 13 0 19 0;
+#X connect 14 0 12 0;
+#X connect 15 0 16 0;
+#X connect 16 0 20 0;
+#X connect 17 0 15 0;
+#X connect 22 0 9 0;
diff --git a/doc/tutorials/networking/09.chat-server.pd b/doc/tutorials/networking/09.chat-server.pd
index f61fe495..701e88b6 100644
--- a/doc/tutorials/networking/09.chat-server.pd
+++ b/doc/tutorials/networking/09.chat-server.pd
@@ -1,4 +1,5 @@
-#N canvas 769 55 458 308 10;
+#N canvas 10 40 620 460 10;
+#X declare -lib libdir;
 #X obj 258 13 import maxlib cyclone zexy;
 #X obj 141 112 netserver 47292;
 #X obj 68 83 prepend broadcast;
diff --git a/doc/tutorials/networking/10.chat_client.pd b/doc/tutorials/networking/10.chat_client.pd
index 1607e626..ef2feabf 100644
--- a/doc/tutorials/networking/10.chat_client.pd
+++ b/doc/tutorials/networking/10.chat_client.pd
@@ -1,18 +1,19 @@
-#N canvas 257 22 610 553 10;
+#N canvas 10 40 620 460 10;
+#X declare -lib libdir;
 #X obj 413 12 import maxlib cyclone zexy;
-#X msg 130 295 disconnect;
-#X obj 108 323 netclient;
-#X obj 50 233 prepend send;
-#X obj 125 415 prepend set;
-#X obj 136 356 print;
-#X obj 27 66 trigger bang bang;
-#X msg 27 88 clear;
-#X text 314 266 <-- first connect to the server;
-#X text 213 294 <-- disconnect when you are done to free the port;
-#N canvas 238 612 454 304 /SUBPATCH/ 0;
+#X msg 160 255 disconnect;
+#X obj 138 283 netclient;
+#X obj 50 203 prepend send;
+#X obj 155 375 prepend set;
+#X obj 166 316 print;
+#X obj 27 36 trigger bang bang;
+#X msg 27 58 clear;
+#X text 344 226 <-- first connect to the server;
+#X text 243 254 <-- disconnect when you are done to free the port;
+#N canvas 238 612 454 304 (subpatch) 0;
 #X obj 101 10 inlet;
 #X obj 100 100 tgl 25 0 empty \$0-tgl connected 0 -6 0 8 -4033 -262144
--1 1 1;
+-1 0 1;
 #X obj 121 35 select 1;
 #X obj 199 245 s \$0-tgl;
 #X msg 224 197 label \$1;
@@ -38,17 +39,17 @@
 #X connect 11 0 9 0;
 #X connect 11 0 7 0;
 #X coords 0 -1 1 1 25 25 1 100 100;
-#X restore 191 345 pd;
-#X msg 108 266 connect pdbox.at.or.at 47292;
-#X msg 27 27 send;
-#X obj 125 436 entry 300 100 grey90 black;
-#X obj 49 121 entry 300 100 grey90 black;
-#X text 114 96 type your message in the box below \, and click send
+#X restore 221 305 pd;
+#X msg 138 226 connect pdbox.at.or.at 47292;
+#X msg 27 7 send;
+#X obj 155 396 flatspace/entry 300 100 grey90 black;
+#X obj 49 91 flatspace/entry 300 100 grey90 black;
+#X text 114 66 type your message in the box below \, and click send
 above;
-#X obj 67 356 niagara 1;
-#X text 68 437 message:;
-#X symbolatom 67 398 25 0 0 0 sender: - -;
-#X obj 67 377 symbol;
+#X obj 97 316 niagara 1;
+#X text 98 397 message:;
+#X symbolatom 97 358 25 0 0 0 sender: - -;
+#X obj 97 337 symbol;
 #X connect 1 0 2 0;
 #X connect 2 0 5 0;
 #X connect 2 0 16 0;
diff --git a/doc/tutorials/networking/11.chat_exercise.pd b/doc/tutorials/networking/11.chat_exercise.pd
index 87885153..b425931d 100644
--- a/doc/tutorials/networking/11.chat_exercise.pd
+++ b/doc/tutorials/networking/11.chat_exercise.pd
@@ -1,7 +1,8 @@
-#N canvas 123 124 644 464 10;
+#N canvas 10 40 620 460 10;
+#X declare -lib libdir;
+#X obj 437 59 import maxlib cyclone zexy;
 #X obj 8 10 cnv 15 400 40 empty empty chat_exercise 20 12 0 24 -225271
 -66577 0;
-#X obj 437 59 import maxlib cyclone zexy;
 #X obj 129 89 prepend broadcast;
 #X obj 202 191 prepend;
 #X obj 246 169 makesymbol client%s_%s;