diff --git a/control/sensing.xml b/control/sensing.xml
index 5a42bd4a1f..b6304b3417 100644
--- a/control/sensing.xml
+++ b/control/sensing.xml
@@ -55,7 +55,7 @@
changed2
metro
metro2
- metrobmp
+ metrobpm
miditempo
seqtime
seqtime2
diff --git a/examples/chnset.csd b/examples/chnset.csd
index bb388d086d..76e02938a2 100644
--- a/examples/chnset.csd
+++ b/examples/chnset.csd
@@ -30,9 +30,9 @@ anois rand .1
chnset anois, "noise"
loop:
idur random .3, 1.5
- timout 0, idur, do
+ timout 0, idur, do_
reinit loop
- do:
+ do_:
ifreq random 400, 1200
iamp random .1, .3
asig oscils iamp, ifreq, 0
diff --git a/examples/matrices_compare.csd b/examples/matrices_compare.csd
new file mode 100644
index 0000000000..902a2a718a
--- /dev/null
+++ b/examples/matrices_compare.csd
@@ -0,0 +1,48 @@
+
+
+-o dac
+
+
+
+sr = 44100
+ksmps = 32
+nchnls = 2
+0dbfs = 1
+
+instr 1
+
+initial ftgen 1, 0, 128, 10, 1 ; initial position = sine wave
+idispl ftgen 2, 0, 128, -7, .01, 128, .01 ; displace
+imass ftgen 3, 0, 128, -7, 5, 128, 5 ; masses
+icent ftgen 4, 0, 128, -7, 1, 128, 1 ; centering
+idamp ftgen 5, 0, 128, -7, -.1, 128, -.1 ; damping
+itraj ftgen 6, 0, 128, -7, 0, 128, 127 ; trajectory
+
+a0 init 0
+irate = .01
+
+;scanu2 init, irate, ifndisplace, ifnmass, imatrix, ifncentr, ifndamp, kmass, kmtrxstiff, kcentr, kdamp, ileft, iright, kpos, kdisplace, ain, idisp, id
+scanu2 1, irate, 2, 3, p4, 4, 5, 20, 9, 0.1, .9, .5, .1, 0, 0, a0, 0, 2
+;ar scans kamp, kfreq, ifntraj, id
+a1 scans 1, 200, 6, 2
+
+if p4 == 50 then
+ prints "\n using binary matrix system\n", p4
+else
+ prints "\n and now the text matrix system\n", p4
+endif
+
+outs a1, a1
+endin
+
+
+
+; both matrices are to be found in the examples forlder of the manual
+f50 0 16384 -23 "string-128.matrxB" ; binary matrix
+f100 0 128 -44 "string-128.matrxT" ; text matrix
+
+i1 0 10 50
+i1 12 10 100
+e
+
+
diff --git a/examples/string-128.matrxT b/examples/string-128.matrxT
new file mode 100644
index 0000000000..bff0ed94de
--- /dev/null
+++ b/examples/string-128.matrxT
@@ -0,0 +1,256 @@
+
+1 2 1
+2 1 1
+2 3 1
+3 2 1
+3 4 1
+4 3 1
+4 5 1
+5 4 1
+5 6 1
+6 5 1
+6 7 1
+7 6 1
+7 8 1
+8 7 1
+8 9 1
+9 8 1
+9 10 1
+10 9 1
+10 11 1
+11 10 1
+11 12 1
+12 11 1
+12 13 1
+13 12 1
+13 14 1
+14 13 1
+14 15 1
+15 14 1
+15 16 1
+16 15 1
+16 17 1
+17 16 1
+17 18 1
+18 17 1
+18 19 1
+19 18 1
+19 20 1
+20 19 1
+20 21 1
+21 20 1
+21 22 1
+22 21 1
+22 23 1
+23 22 1
+23 24 1
+24 23 1
+24 25 1
+25 24 1
+25 26 1
+26 25 1
+26 27 1
+27 26 1
+27 28 1
+28 27 1
+28 29 1
+29 28 1
+29 30 1
+30 29 1
+30 31 1
+31 30 1
+31 32 1
+32 31 1
+32 33 1
+33 32 1
+33 34 1
+34 33 1
+34 35 1
+35 34 1
+35 36 1
+36 35 1
+36 37 1
+37 36 1
+37 38 1
+38 37 1
+38 39 1
+39 38 1
+39 40 1
+40 39 1
+40 41 1
+41 40 1
+41 42 1
+42 41 1
+42 43 1
+43 42 1
+43 44 1
+44 43 1
+44 45 1
+45 44 1
+45 46 1
+46 45 1
+46 47 1
+47 46 1
+47 48 1
+48 47 1
+48 49 1
+49 48 1
+49 50 1
+50 49 1
+50 51 1
+51 50 1
+51 52 1
+52 51 1
+52 53 1
+53 52 1
+53 54 1
+54 53 1
+54 55 1
+55 54 1
+55 56 1
+56 55 1
+56 57 1
+57 56 1
+57 58 1
+58 57 1
+58 59 1
+59 58 1
+59 60 1
+60 59 1
+60 61 1
+61 60 1
+61 62 1
+62 61 1
+62 63 1
+63 62 1
+63 64 1
+64 63 1
+64 65 1
+65 64 1
+65 66 1
+66 65 1
+66 67 1
+67 66 1
+67 68 1
+68 67 1
+68 69 1
+69 68 1
+69 70 1
+70 69 1
+70 71 1
+71 70 1
+71 72 1
+72 71 1
+72 73 1
+73 72 1
+73 74 1
+74 73 1
+74 75 1
+75 74 1
+75 76 1
+76 75 1
+76 77 1
+77 76 1
+77 78 1
+78 77 1
+78 79 1
+79 78 1
+79 80 1
+80 79 1
+80 81 1
+81 80 1
+81 82 1
+82 81 1
+82 83 1
+83 82 1
+83 84 1
+84 83 1
+84 85 1
+85 84 1
+85 86 1
+86 85 1
+86 87 1
+87 86 1
+87 88 1
+88 87 1
+88 89 1
+89 88 1
+89 90 1
+90 89 1
+90 91 1
+91 90 1
+91 92 1
+92 91 1
+92 93 1
+93 92 1
+93 94 1
+94 93 1
+94 95 1
+95 94 1
+95 96 1
+96 95 1
+96 97 1
+97 96 1
+97 98 1
+98 97 1
+98 99 1
+99 98 1
+99 100 1
+100 99 1
+100 101 1
+101 100 1
+101 102 1
+102 101 1
+102 103 1
+103 102 1
+103 104 1
+104 103 1
+104 105 1
+105 104 1
+105 106 1
+106 105 1
+106 107 1
+107 106 1
+107 108 1
+108 107 1
+108 109 1
+109 108 1
+109 110 1
+110 109 1
+110 111 1
+111 110 1
+111 112 1
+112 111 1
+112 113 1
+113 112 1
+113 114 1
+114 113 1
+114 115 1
+115 114 1
+115 116 1
+116 115 1
+116 117 1
+117 116 1
+117 118 1
+118 117 1
+118 119 1
+119 118 1
+119 120 1
+120 119 1
+120 121 1
+121 120 1
+121 122 1
+122 121 1
+122 123 1
+123 122 1
+123 124 1
+124 123 1
+124 125 1
+125 124 1
+125 126 1
+126 125 1
+126 127 1
+127 126 1
+127 128 1
+128 127 1
+
diff --git a/opcodes/vibes.xml b/opcodes/vibes.xml
index 4776b0b57a..440987cc50 100644
--- a/opcodes/vibes.xml
+++ b/opcodes/vibes.xml
@@ -91,7 +91,7 @@ url="ftp://ftp.cs.bath.ac.uk/pub/dream/documentation/sounds/modelling/">
- A musical examples featuring the vibes opcode: Vibes_Pena.csd, by luis Antunes Pena.
+ A musical example featuring the vibes opcode: Vibes_Pena.csd, by luis Antunes Pena.
diff --git a/siggen/scantop.xml b/siggen/scantop.xml
index 90191deecc..96ae0c35ba 100644
--- a/siggen/scantop.xml
+++ b/siggen/scantop.xml
@@ -173,15 +173,14 @@ As an example for the binary matrix, for 4 masses we have the following grid des
- As an example of a text matrix (see GEN44), for 4 masses we have the following grid describing the possible connections:
+ As an example of a text matrix (see GEN44), for the same 4 masses we have the following grid describing the connections:
<MATRIX size=4>
-0 0 4
-1 1 2
-2 2 4
-3 3 3
+1 2 4
+2 3 2
+3 4 6
</MATRIX>
@@ -195,9 +194,19 @@ As an example for the binary matrix, for 4 masses we have the following grid des
Both these matrix examples are very small and simple. In practice, most scanned synthesis instruments will use many more masses than four, so their matrices will be much larger and more complex. See the example in the scans documentation.
-
+
+
+
+ Here is an example that compares the binary and the text matrix. They sound the same. It uses the file matrices_compare.csd.
+
+ Example comparing the use of the binary and the text matrix.
+
+
+
+
+
- Please note that the generated dynamic wavetables can be very unstable. Certain values for masses, centering, and damping can cause the system to blow up
and the most interesting sounds to emerge from your loudspeakers!
+ Please note that generated dynamic wavetables can be very unstable. Certain values for masses, centering, and damping can cause the system to blow up
and the most interesting sounds to emerge from your loudspeakers!