merge in HC's new tcl code and start taking patches

svn path=/trunk/; revision=12166

6 files changed, 91 insertions, 82 deletions

diff --git a/pd/doc/3.audio.examples/E07.evenodd.pd b/pd/doc/3.audio.examples/E07.evenodd.pd
index 9715e1ea..e6d3851e 100644
--- a/pd/doc/3.audio.examples/E07.evenodd.pd
+++ b/pd/doc/3.audio.examples/E07.evenodd.pd
@@ -38,11 +38,11 @@
 #X text 299 152 <--transpose;
 #N canvas 0 0 538 208 make-table 0;
 #X obj 38 71 loadbang;
-#X text 16 11 This patch loads a sequence of pitches into array1. The
+#X text 16 11 This patch loads a sequence of pitches into E07. The
 values are floating-point \, so we could use microtones (60.5 \, for
 example) if we wish.;
-#X msg 38 99 \; array1 0 55 56 57 55 57 61 55 61 63 57 63 \; array1
-yticks 36 12 1 \; array1 ylabel 12 36 48 60 72 84 96;
+#X msg 38 99 \; E07 0 55 56 57 55 57 61 55 61 63 57 63 \; E07
+yticks 36 12 1 \; E07 ylabel 12 36 48 60 72 84 96;
 #X connect 0 0 2 0;
 #X restore 527 195 pd make-table;
 #X obj 176 50 sel 0;
diff --git a/pd/doc/3.audio.examples/E10.complex.FM.pd b/pd/doc/3.audio.examples/E10.complex.FM.pd
index 094d68ed..fbd6ce99 100644
--- a/pd/doc/3.audio.examples/E10.complex.FM.pd
+++ b/pd/doc/3.audio.examples/E10.complex.FM.pd
@@ -43,7 +43,7 @@ frequency for showing spectra: the 16th bin in a 4096-point spectrum
 #X text 273 232 toggle to graph repeatedly;
 #X text 262 212 bang to graph once;
 #X obj 16 494 t b f;
-#X obj 19 295 tabwrite~ E10-signal;
+#X obj 19 295 tabwrite~ E10-spectrum;
 #X obj 208 295 tabwrite~ E10-spectrum;
 #X text 72 536 set carrier multiplier and modulation multipliers after
 fundamental;
diff --git a/pd/doc/3.audio.examples/H04.filter.sweep.pd b/pd/doc/3.audio.examples/H04.filter.sweep.pd
index e4f3cf09..1675e9a6 100644
--- a/pd/doc/3.audio.examples/H04.filter.sweep.pd
+++ b/pd/doc/3.audio.examples/H04.filter.sweep.pd
@@ -1,4 +1,4 @@
-#N canvas 360 15 553 524 12;
+#N canvas 360 22 557 528 12;
 #X floatatom 44 146 5 0 150 0 - #0-pitch -;
 #X text 126 9 SWEEPING FILTERS;
 #X obj 44 193 phasor~;
@@ -43,6 +43,30 @@ sweep speeds.;
 "vcf~" instead of "bp~". The vcf~ module takes an audio signal to set
 center frequency. (Q is still set by messages though.) Vcf is computationally
 somewhat more expensive than bp~.;
+#N canvas 0 22 612 404 conversion-tables 0;
+#N canvas 0 22 450 300 graph2 0;
+#X array mtof 130 float 1;
+#A 0 8.1758 8.66196 9.17702 9.72272 10.3009 10.9134 11.5623 12.2499
+12.9783 13.75 14.5676 15.4339 16.3516 17.3239 18.354 19.4454 20.6017
+21.8268 23.1247 24.4997 25.9565 27.5 29.1352 30.8677 32.7032 34.6478
+36.7081 38.8909 41.2034 43.6535 46.2493 48.9994 51.9131 55 58.2705
+61.7354 65.4064 69.2957 73.4162 77.7817 82.4069 87.3071 92.4986 97.9989
+103.826 110 116.541 123.471 130.813 138.591 146.832 155.563 164.814
+174.614 184.997 195.998 207.652 220 233.082 246.942 261.626 277.183
+293.665 311.127 329.628 349.228 369.994 391.995 415.305 440 466.164
+493.883 523.251 554.365 587.33 622.254 659.255 698.456 739.989 783.991
+830.609 880 932.328 987.767 1046.5 1108.73 1174.66 1244.51 1318.51
+1396.91 1479.98 1567.98 1661.22 1760 1864.66 1975.53 2093 2217.46 2349.32
+2489.02 2637.02 2793.83 2959.96 3135.96 3322.44 3520 3729.31 3951.07
+4186.01 4434.92 4698.64 4978.03 5274.04 5587.65 5919.91 6271.93 6644.88
+7040 7458.62 7902.13 8372.02 8869.84 9397.27 9956.06 10548.1 11175.3
+11839.8 12543.9 13289.8 14080;
+#X coords 0 12000 130 0 200 100 1;
+#X restore 309 225 graph;
+#X text 319 333 ------ 130 samples ------;
+#X text 518 318 0;
+#X text 520 218 12000;
+#X restore 168 463 pd conversion-tables;
 #X connect 0 0 21 0;
 #X connect 2 0 8 0;
 #X connect 3 0 9 0;
diff --git a/pd/doc/3.audio.examples/H05.filter.floyd.pd b/pd/doc/3.audio.examples/H05.filter.floyd.pd
index 2187f05d..401b5628 100644
--- a/pd/doc/3.audio.examples/H05.filter.floyd.pd
+++ b/pd/doc/3.audio.examples/H05.filter.floyd.pd
@@ -1,30 +1,31 @@
-#N canvas 708 41 555 646 12;
-#N canvas 0 0 600 392 conversion-tables 0;
-#N canvas 0 0 450 300 graph1 0;
+#N canvas 288 109 559 650 12;
+#N canvas 0 22 604 396 conversion-tables 0;
+#N canvas 0 22 450 300 graph1 0;
 #X array dbtorms 123 float 1;
 #A 0 0 0 1.25893e-05 1.41254e-05 1.58489e-05 1.77828e-05 1.99526e-05
 2.23872e-05 2.51189e-05 2.81838e-05 3.16228e-05 3.54813e-05 3.98107e-05
 4.46684e-05 5.01187e-05 5.62341e-05 6.30957e-05 7.07946e-05 7.94328e-05
-8.91251e-05 1e-04 0.000112202 0.000125893 0.000141254 0.000158489 0.000177828
-0.000199526 0.000223872 0.000251189 0.000281838 0.000316228 0.000354813
-0.000398107 0.000446684 0.000501187 0.000562341 0.000630957 0.000707946
-0.000794328 0.000891251 0.001 0.00112202 0.00125893 0.00141254 0.00158489
-0.00177828 0.00199526 0.00223872 0.00251189 0.00281838 0.00316228 0.00354813
-0.00398107 0.00446684 0.00501187 0.00562341 0.00630957 0.00707946 0.00794328
-0.00891251 0.01 0.0112202 0.0125893 0.0141254 0.0158489 0.0177828 0.0199526
-0.0223872 0.0251189 0.0281838 0.0316228 0.0354813 0.0398107 0.0446684
-0.0501187 0.0562341 0.0630957 0.0707946 0.0794328 0.0891251 0.1 0.112202
-0.125893 0.141254 0.158489 0.177828 0.199526 0.223872 0.251189 0.281838
-0.316228 0.354813 0.398107 0.446684 0.501187 0.562341 0.630957 0.707946
-0.794328 0.891251 1 1.12202 1.25893 1.41254 1.58489 1.77828 1.99526
-2.23872 2.51189 2.81838 3.16228 3.54813 3.98107 4.46684 5.01187 5.62341
-6.30957 7.07946 7.94328 8.91251 10 11.2202 12.5893;
+8.91251e-05 0.0001 0.000112202 0.000125893 0.000141254 0.000158489
+0.000177828 0.000199526 0.000223872 0.000251189 0.000281838 0.000316228
+0.000354813 0.000398107 0.000446684 0.000501187 0.000562341 0.000630957
+0.000707946 0.000794328 0.000891251 0.001 0.00112202 0.00125893 0.00141254
+0.00158489 0.00177828 0.00199526 0.00223872 0.00251189 0.00281838 0.00316228
+0.00354813 0.00398107 0.00446684 0.00501187 0.00562341 0.00630957 0.00707946
+0.00794328 0.00891251 0.01 0.0112202 0.0125893 0.0141254 0.0158489
+0.0177828 0.0199526 0.0223872 0.0251189 0.0281838 0.0316228 0.0354813
+0.0398107 0.0446684 0.0501187 0.0562341 0.0630957 0.0707946 0.0794328
+0.0891251 0.1 0.112202 0.125893 0.141254 0.158489 0.177828 0.199526
+0.223872 0.251189 0.281838 0.316228 0.354813 0.398107 0.446684 0.501187
+0.562341 0.630957 0.707946 0.794328 0.891251 1 1.12202 1.25893 1.41254
+1.58489 1.77828 1.99526 2.23872 2.51189 2.81838 3.16228 3.54813 3.98107
+4.46684 5.01187 5.62341 6.30957 7.07946 7.94328 8.91251 10 11.2202
+12.5893;
 #X coords 0 10 123 0 200 100 1;
 #X restore 302 48 graph;
 #X text 504 141 0;
 #X text 506 41 10;
 #X text 321 151 ------ 123 samples ------;
-#N canvas 0 0 450 300 graph2 0;
+#N canvas 0 22 450 300 graph2 0;
 #X array mtof 130 float 1;
 #A 0 8.1758 8.66196 9.17702 9.72272 10.3009 10.9134 11.5623 12.2499
 12.9783 13.75 14.5676 15.4339 16.3516 17.3239 18.354 19.4454 20.6017
@@ -65,7 +66,7 @@
 #X obj 55 145 + 1;
 #X obj 22 217 mtof;
 #X obj 55 169 mod 8;
-#N canvas 0 0 450 300 graph1 0;
+#N canvas 0 22 450 300 graph1 0;
 #X array \$0-array1 8 float 2;
 #X coords 0 96 8 36 200 100 1;
 #X restore 340 144 graph;
@@ -74,9 +75,9 @@
 #X text 107 147 sequencer for;
 #X text 122 164 8 note loop;
 #X obj 16 576 output~;
-#X obj 22 104 tgl 15 0 empty \$1-metro empty 0 -6 0 8 -262144 -1 -1
-1 1;
-#N canvas 876 177 375 255 startup 0;
+#X obj 22 104 tgl 15 0 empty \$0-metro empty 0 -6 0 8 -262144 -1 -1
+0 1;
+#N canvas 876 177 379 259 startup 0;
 #X obj 22 24 loadbang;
 #X obj 22 48 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
 -1;
diff --git a/pd/doc/3.audio.examples/I07.phase.vocoder.pd b/pd/doc/3.audio.examples/I07.phase.vocoder.pd
index 95017436..735b8cd2 100644
--- a/pd/doc/3.audio.examples/I07.phase.vocoder.pd
+++ b/pd/doc/3.audio.examples/I07.phase.vocoder.pd
@@ -1,8 +1,8 @@
-#N canvas 164 25 744 599 12;
+#N canvas 425 33 744 599 12;
 #X floatatom 494 315 5 0 0 0 - transpo-set -;
 #X floatatom 167 383 3 0 0 0 - speed-set -;
 #X floatatom 55 385 7 0 0 0 - location-set -;
-#N canvas 199 40 821 693 fft-analysis 0;
+#N canvas 90 42 821 693 fft-analysis 0;
 #X obj 51 477 *~;
 #X obj 18 477 *~;
 #X obj 18 499 -~;
@@ -39,7 +39,7 @@ bang;
 #X obj 97 425 q8_rsqrt~;
 #N canvas 139 105 1006 799 read-windows 0;
 #X obj 18 693 *~;
-#X obj 364 448 r window-size;
+#X obj 340 448 r window-size;
 #X obj 156 300 f;
 #X obj 102 91 r window-size;
 #X obj 102 139 /;
@@ -60,14 +60,14 @@ bang;
 #X text 188 394 reading location (samples);
 #X obj 51 597 / 4;
 #X obj 288 245 * 0.01;
-#X floatatom 364 498 7 0 0 0 - - -;
-#X obj 364 474 *;
-#X obj 502 347 r transpo;
-#X obj 502 369 * 0.01;
-#X obj 504 390 + 69;
-#X obj 505 411 mtof;
-#X obj 505 433 / 440;
-#X obj 399 474 t b f;
+#X floatatom 340 498 7 0 0 0 - - -;
+#X obj 340 474 *;
+#X obj 499 365 r transpo;
+#X obj 499 387 * 0.01;
+#X obj 501 408 + 69;
+#X obj 502 429 mtof;
+#X obj 502 451 / 440;
+#X obj 375 474 t b f;
 #X obj 19 719 outlet~;
 #X obj 195 720 outlet~;
 #X obj 218 664 tabreceive~ \$0-hann;
@@ -77,7 +77,7 @@ bang;
 #X obj 768 508 r speed;
 #X msg 768 532 set \$1;
 #X obj 768 557 s speed-set;
-#X text 432 498 stretched window size (samples);
+#X text 411 498 stretched window size (samples);
 #X obj 877 507 r transpo;
 #X msg 877 533 set \$1;
 #X obj 877 558 s transpo-set;
@@ -123,8 +123,8 @@ by "location". If "speed" is nonzero \, "location" automatically precesses.
 #X obj 845 684 r auto;
 #X obj 730 685 r no-detune;
 #X msg 730 707 \; detune 0;
-#X text 321 280 loop to precess the location according;
-#X text 320 296 to the "speed" parameter.;
+#X text 326 275 loop to precess the location according;
+#X text 325 291 to the "speed" parameter.;
 #X text 611 31 if location changes \, update number box;
 #X text 610 50 in main window via "location-set" \, but;
 #X text 613 69 taking care to limit frequency of updates.;
@@ -136,14 +136,6 @@ by "location". If "speed" is nonzero \, "location" automatically precesses.
 #X text 496 527 "rewind" control takes us;
 #X text 499 545 to a location depending on;
 #X text 499 564 stretched window size.;
-#X obj 593 457 t b f;
-#X obj 617 395 samplerate~;
-#X obj 593 348 r \$0-insamprate;
-#X obj 593 418 /;
-#X obj 505 455 * 1;
-#X text 494 312 desired transposition and sample;
-#X text 494 329 rate correction for soundfile;
-#X obj 593 370 t f b;
 #X connect 0 0 30 0;
 #X connect 1 0 23 0;
 #X connect 2 0 11 0;
@@ -179,7 +171,7 @@ by "location". If "speed" is nonzero \, "location" automatically precesses.
 #X connect 25 0 26 0;
 #X connect 26 0 27 0;
 #X connect 27 0 28 0;
-#X connect 28 0 99 0;
+#X connect 28 0 29 0;
 #X connect 29 0 23 0;
 #X connect 29 1 23 1;
 #X connect 32 0 5 1;
@@ -224,14 +216,6 @@ by "location". If "speed" is nonzero \, "location" automatically precesses.
 #X connect 77 0 75 0;
 #X connect 79 0 78 0;
 #X connect 80 0 81 0;
-#X connect 95 0 99 0;
-#X connect 95 1 99 1;
-#X connect 96 0 98 1;
-#X connect 97 0 102 0;
-#X connect 98 0 95 0;
-#X connect 99 0 29 0;
-#X connect 102 0 98 0;
-#X connect 102 1 96 0;
 #X restore 109 133 pd read-windows;
 #X obj 137 543 tabsend~ prev-imag;
 #X obj 136 567 tabsend~ prev-real;
@@ -363,11 +347,11 @@ shifts the signal to the left or right depending on its argument.)
 #X connect 54 0 21 0;
 #X restore 55 480 pd fft-analysis;
 #N canvas 260 23 647 768 phase-tables 0;
-#N canvas 0 0 450 300 (subpatch) 0;
+#N canvas 0 0 450 300 graph2 0;
 #X array prev-imag 4096 float 0;
 #X coords 0 1000 4096 -1000 400 300 1;
 #X restore 169 326 graph;
-#N canvas 0 0 450 300 (subpatch) 0;
+#N canvas 0 0 450 300 graph3 0;
 #X array prev-real 4096 float 0;
 #X coords 0 500 4096 -500 400 300 1;
 #X restore 170 17 graph;
@@ -378,9 +362,9 @@ shifts the signal to the left or right depending on its argument.)
 #X text 389 359 normal;
 #X obj 56 517 output~;
 #N canvas 0 110 565 454 hann-window 0;
-#N canvas 0 0 450 300 (subpatch) 0;
-#X array \$0-hann 4096 float 0;
-#X coords 0 1 4095 0 300 100 1;
+#N canvas 0 0 450 300 graph1 0;
+#X array \$0-hann 1024 float 0;
+#X coords 0 1 1023 0 300 100 1;
 #X restore 82 311 graph;
 #X obj 378 165 osc~;
 #X obj 378 190 *~ -0.5;
@@ -428,9 +412,9 @@ and window-msec (analysis window size in seconds and msec).;
 #X connect 19 1 18 0;
 #X restore 440 528 pd hann-window;
 #N canvas 388 86 694 447 insample 0;
-#N canvas 0 0 450 300 (subpatch) 0;
-#X array \$0-sample 82301 float 0;
-#X coords 0 1 82300 -1 400 150 1;
+#N canvas 0 0 450 300 graph1 0;
+#X array \$0-sample 160161 float 0;
+#X coords 0 1 160160 -1 400 150 1;
 #X restore 281 135 graph;
 #X obj 28 133 r read-sample;
 #X obj 28 184 unpack s f;
@@ -449,12 +433,12 @@ and window-msec (analysis window size in seconds and msec).;
 #X obj 28 381 * 1000;
 #X obj 28 404 s \$0-samp-msec;
 #X obj 66 357 r \$0-insamprate;
-#X obj 37 68 hip~ 5;
-#X obj 37 44 adc~ 1;
+#X obj 29 70 hip~ 5;
+#X obj 29 46 adc~ 1;
 #X obj 29 9 inlet;
-#X obj 99 44 samplerate~;
+#X obj 91 46 samplerate~;
 #X obj 29 93 tabwrite~ \$0-sample;
-#X obj 99 68 s \$0-insamprate;
+#X obj 91 70 s \$0-insamprate;
 #X msg 285 383 \; read-sample ../sound/voice.wav;
 #X obj 276 20 inlet;
 #X obj 276 42 openpanel;
@@ -479,7 +463,7 @@ and window-msec (analysis window size in seconds and msec).;
 #X connect 18 0 22 0;
 #X connect 19 0 18 0;
 #X connect 20 0 21 0;
-#X connect 20 0 22 0;
+#X connect 20 0 19 0;
 #X connect 21 0 23 0;
 #X connect 25 0 26 0;
 #X connect 26 0 27 0;
@@ -501,6 +485,7 @@ and window-msec (analysis window size in seconds and msec).;
 #X obj 262 408 s rewind;
 #X msg 345 336 200;
 #X msg 345 358 100;
+#X msg 345 380 20;
 #X text 386 335 contract;
 #X text 390 380 expand;
 #X obj 493 407 s lock;
@@ -542,7 +527,6 @@ to see the workings.;
 #X obj 535 460 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
 -1;
 #X text 466 458 file ->;
-#X msg 345 380 20;
 #X connect 0 0 5 0;
 #X connect 1 0 21 0;
 #X connect 2 0 20 0;
@@ -552,13 +536,13 @@ to see the workings.;
 #X connect 14 0 16 0;
 #X connect 15 0 16 0;
 #X connect 17 0 11 0;
-#X connect 19 0 28 0;
+#X connect 19 0 29 0;
 #X connect 22 0 23 0;
-#X connect 24 0 48 0;
-#X connect 25 0 48 0;
-#X connect 38 0 42 0;
-#X connect 39 0 42 0;
-#X connect 40 0 42 0;
-#X connect 41 0 42 0;
-#X connect 52 0 11 1;
-#X connect 54 0 48 0;
+#X connect 24 0 49 0;
+#X connect 25 0 49 0;
+#X connect 26 0 49 0;
+#X connect 39 0 43 0;
+#X connect 40 0 43 0;
+#X connect 41 0 43 0;
+#X connect 42 0 43 0;
+#X connect 53 0 11 1;
diff --git a/pd/doc/3.audio.examples/J01.even.odd.pd b/pd/doc/3.audio.examples/J01.even.odd.pd
index 71c9fdf5..18603bb3 100644
--- a/pd/doc/3.audio.examples/J01.even.odd.pd
+++ b/pd/doc/3.audio.examples/J01.even.odd.pd
@@ -40,7 +40,7 @@ and heard. (Listen to the two outputs separately \, then together.)
 #X text 95 350 output level;
 #X text 100 308 for difference;
 #X text 157 77 <-- click to graph;
-#X msg 148 97 \; pd DSP 1;
+#X msg 148 97 \; pd dsp 1;
 #X obj 138 247 tabwrite~ \$0-difference;
 #X obj 138 270 tabwrite~ \$0-sum;
 #X obj 138 138 tabwrite~ \$0-phasor;