summaryrefslogtreecommitdiff
path: root/scoregens
diff options
context:
space:
mode:
authorFelipe Sateler <fsateler@debian.org>2014-01-24 13:54:37 -0300
committerFelipe Sateler <fsateler@debian.org>2014-01-24 13:54:37 -0300
commitbcf06a42deb371baf3deb9f4addb474b08273120 (patch)
tree4a8c3fb811dd164d4486628d8eff6043ebe8a6c3 /scoregens
parent3a91171181113761a14bcc36a086a8dda144b77b (diff)
Imported Upstream version 6.02~dfsg
Diffstat (limited to 'scoregens')
-rw-r--r--scoregens/a.xml12
-rw-r--r--scoregens/b.xml23
-rw-r--r--scoregens/e.xml12
-rw-r--r--scoregens/gen01.xml60
-rw-r--r--scoregens/gen02.xml49
-rw-r--r--scoregens/gen03.xml77
-rw-r--r--scoregens/gen04.xml71
-rw-r--r--scoregens/gen05.xml38
-rw-r--r--scoregens/gen06.xml36
-rw-r--r--scoregens/gen07.xml52
-rw-r--r--scoregens/gen08.xml38
-rw-r--r--scoregens/gen09.xml69
-rw-r--r--scoregens/gen10.xml69
-rw-r--r--scoregens/gen11.xml56
-rw-r--r--scoregens/gen12.xml33
-rw-r--r--scoregens/gen13.xml112
-rw-r--r--scoregens/gen14.xml76
-rw-r--r--scoregens/gen15.xml98
-rw-r--r--scoregens/gen16.xml12
-rw-r--r--scoregens/gen17.xml26
-rw-r--r--scoregens/gen18.xml60
-rw-r--r--scoregens/gen19.xml31
-rw-r--r--scoregens/gen20.xml47
-rw-r--r--scoregens/gen21.xml83
-rw-r--r--scoregens/gen23.xml29
-rw-r--r--scoregens/gen24.xml12
-rw-r--r--scoregens/gen25.xml30
-rw-r--r--scoregens/gen27.xml29
-rw-r--r--scoregens/gen28.xml10
-rw-r--r--scoregens/gen30.xml12
-rw-r--r--scoregens/gen32.xml61
-rw-r--r--scoregens/gen33.xml53
-rw-r--r--scoregens/gen34.xml53
-rw-r--r--scoregens/gen40.xml60
-rw-r--r--scoregens/gen41.xml44
-rw-r--r--scoregens/gen42.xml49
-rw-r--r--scoregens/gen49.xml27
-rw-r--r--scoregens/gen51.xml57
-rw-r--r--scoregens/gen52.xml27
-rw-r--r--scoregens/genexp.xml54
-rw-r--r--scoregens/genfarey.xml43
-rw-r--r--scoregens/gensone.xml41
-rw-r--r--scoregens/gentanh.xml69
-rw-r--r--scoregens/genwave.xml107
-rw-r--r--scoregens/i.xml68
-rw-r--r--scoregens/m.xml11
-rw-r--r--scoregens/n.xml7
-rw-r--r--scoregens/q.xml12
-rw-r--r--scoregens/r.xml2
-rw-r--r--scoregens/s.xml12
-rw-r--r--scoregens/t.xml12
-rw-r--r--scoregens/top.xml6
-rw-r--r--scoregens/v.xml31
-rw-r--r--scoregens/x.xml12
54 files changed, 1801 insertions, 479 deletions
diff --git a/scoregens/a.xml b/scoregens/a.xml
index 3dbaa1e..1e9b2c0 100644
--- a/scoregens/a.xml
+++ b/scoregens/a.xml
@@ -59,4 +59,16 @@
</para>
</refsect2>
</refsect1>
+
+ <refsect1>
+ <title>Examples</title>
+ <para>
+ Here is an example of the a statement. It uses the file <ulink url="examples/a.csd"><citetitle>a.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the a statement.</title>
+ <xi:include href="examples-xml/a.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ </para>
+ </refsect1>
+
</refentry>
diff --git a/scoregens/b.xml b/scoregens/b.xml
index 5c6f81d..1b42741 100644
--- a/scoregens/b.xml
+++ b/scoregens/b.xml
@@ -37,26 +37,15 @@
</para>
</refsect2>
</refsect1>
-
+
<refsect1>
<title>Examples</title>
<para>
- <informalexample>
- <programlisting>
-<emphasis role="stamnt">i</emphasis>1 0 2
-<emphasis role="stamnt">i</emphasis>1 10 888
-
-<emphasis role="stamnt">b</emphasis> 5 <emphasis role="comment">; set the clock &quot;forward&quot;</emphasis>
-<emphasis role="stamnt">i</emphasis>2 1 1 440 <emphasis role="comment">; start time = 6</emphasis>
-<emphasis role="stamnt">i</emphasis>2 2 1 480 <emphasis role="comment">; start time = 7</emphasis>
-
-<emphasis role="stamnt">b</emphasis> -1 <emphasis role="comment">; set the clock back</emphasis>
-<emphasis role="stamnt">i</emphasis>3 3 2 3.1415 <emphasis role="comment">; start time = 2</emphasis>
-<emphasis role="stamnt">i</emphasis>3 5.5 1 1.1111 <emphasis role="comment">; start time = 4.5</emphasis>
-
-<emphasis role="stamnt">b</emphasis> 0 <emphasis role="comment">; reset clock to normal</emphasis>
-<emphasis role="stamnt">i</emphasis>4 10 200 7 <emphasis role="comment">; start time = 10</emphasis></programlisting>
- </informalexample>
+ Here is an example of the b statement. It uses the file <ulink url="examples/b.csd"><citetitle>b.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the b statement.</title>
+ <xi:include href="examples-xml/b.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
</para>
</refsect1>
diff --git a/scoregens/e.xml b/scoregens/e.xml
index 3ea9745..c428af6 100644
--- a/scoregens/e.xml
+++ b/scoregens/e.xml
@@ -45,4 +45,16 @@
</para>
</refsect2>
</refsect1>
+
+ <refsect1>
+ <title>Examples</title>
+ <para>
+ Here is an example of the e statement. It uses the file <ulink url="examples/e.csd"><citetitle>e.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the e statement.</title>
+ <xi:include href="examples-xml/e.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ </para>
+ </refsect1>
+
</refentry>
diff --git a/scoregens/gen01.xml b/scoregens/gen01.xml
index 5770a6b..7012bd1 100644
--- a/scoregens/gen01.xml
+++ b/scoregens/gen01.xml
@@ -70,6 +70,12 @@
If p4 is positive, the table will be post-normalized (rescaled to a maximum absolute value of 1 after generation). A negative p4 will cause rescaling to be skipped.
</para>
</listitem>
+
+ <listitem>
+ <para>
+ GEN01 also works with WAV and OGG and a dozen and more other sound formats; these file formats depend on libsndfile, see <ulink url="http://www.mega-nerd.com/libsndfile/"><citetitle>http://www.mega-nerd.com/libsndfile/</citetitle></ulink>
+ </para>
+ </listitem>
</itemizedlist>
</para>
</note>
@@ -78,45 +84,63 @@
<refsect1>
<title>Examples</title>
<para>
- Here is a simple example of the GEN01 routine. It uses the files <ulink url="examples/gen01.csd"><citetitle>gen01.csd</citetitle></ulink>, and <ulink url="examples/beats.wav"><citetitle>beats.wav</citetitle></ulink>. It uses the audio file <quote>beats.wav</quote>, here is its diagram:
+ Here is an example of the GEN01 routine. It uses the files <ulink url="examples/gen01.csd"><citetitle>gen01.csd</citetitle></ulink> and several sound files.
+ <example>
+ <title>An example of the GEN01 routine.</title>
+ <xi:include href="examples-xml/gen01.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+
+ <textobject>
+ <phrase>These are the diagrams of the waveforms of the GEN01 routines, as used in the example:</phrase>
+ </textobject>
+
<mediaobject>
<imageobject>
- <imagedata fileref="images/gen01.png" format="PNG"/>
+ <imagedata fileref="images/gen01_1.png" format="PNG"/>
</imageobject>
<textobject>
- <phrase>Diagram of the waveform generated by GEN01.</phrase>
+ <phrase>f 1 0 131072 1 "beats.wav" 0 0 0 - non-deferred sound</phrase>
</textobject>
<caption>
- <para>Diagram of the waveform generated by GEN01.</para>
+ <para>f 1 0 131072 1 "beats.wav" 0 0 0 - non-deferred sound</para>
</caption>
</mediaobject>
- <example>
- <title>A simple example of the GEN01 routine.</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen01_2.png" format="PNG"/>
+ </imageobject>
- <xi:include href="examples-xml/gen01.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <textobject>
+ <phrase>f 2 0 0 1 "flute.aiff" 0 0 0 - deferred sound</phrase>
+ </textobject>
- </example>
- </para>
+ <caption>
+ <para>f 2 0 0 1 "flute.aiff" 0 0 0 - deferred sound</para>
+ </caption>
+ </mediaobject>
- <para>
- Here is another example of the GEN01 routine. Csound will automatically compute the tablesize because we have set it to 0. This example uses the files <ulink url="examples/gen01computed.csd"><citetitle>gen01computed.csd</citetitle></ulink>, and <ulink url="examples/beats.wav"><citetitle>beats.wav</citetitle></ulink>.
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen01_3.png" format="PNG"/>
+ </imageobject>
- <example>
- <title>An example of the GEN01 routine with a computed tablesize.</title>
+ <textobject>
+ <phrase>f 3 0 0 1 "beats.ogg" 0 0 0 - deferred sound</phrase>
+ </textobject>
- <xi:include href="examples-xml/gen01computed.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <caption>
+ <para>f 3 0 0 1 "beats.ogg" 0 0 0 - deferred sound</para>
+ </caption>
+ </mediaobject>
- </example>
</para>
</refsect1>
<refsect1>
<title>Credits</title>
- <para>Examples written by &namekevin;</para>
- <para>December 2002. Thanks goes to Kanata Motohashi for fixing mistakes in the examples.</para>
- <para>September 2003. Thanks goes to Dr. Richard Boulanger for pointing out the references to the AIFF file format. GEN01 also works with WAV files.</para>
+ <para>September 2003. Thanks goes to Dr. Richard Boulanger for pointing out the references to the AIFF file format.</para>
</refsect1>
</refentry>
diff --git a/scoregens/gen02.xml b/scoregens/gen02.xml
index 374a882..282403f 100644
--- a/scoregens/gen02.xml
+++ b/scoregens/gen02.xml
@@ -49,27 +49,60 @@
<refsect1>
<title>Examples</title>
<para>
- Here is a simple example of the GEN02 routine. It uses the files <ulink url="examples/gen02.csd"><citetitle>gen02.csd</citetitle></ulink>. It places 12 values plus an explicit wrap-around guard value into a table of size next-highest power of 2. Rescaling is inhibited. Here is its diagram:
+ Here is an example of the GEN02 routine. It uses the files <ulink url="examples/gen02.csd"><citetitle>gen02.csd</citetitle></ulink>.
+
+ <example>
+ <title>Example of the GEN02 routine.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/gen02.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+
+ <textobject>
+ <phrase>These are the diagrams of the waveforms of the GEN02 routines, as used in the example:</phrase>
+ </textobject>
<mediaobject>
<imageobject>
- <imagedata fileref="images/gen02.png" format="PNG"/>
+ <imagedata fileref="images/gen02_1.png" format="PNG"/>
</imageobject>
<textobject>
- <phrase>Diagram of the waveform generated by GEN02.</phrase>
+ <phrase>f 2 0 5 2 0 2 0</phrase>
</textobject>
<caption>
- <para>Diagram of the waveform generated by GEN02.</para>
+ <para>f 2 0 5 2 0 2 0</para>
</caption>
</mediaobject>
- <example>
- <title>A simple example of the GEN02 routine.</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen02_2.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 3 0 5 2 0 2 10 0</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 3 0 5 2 0 2 10 0</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen02_3.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 4 0 9 2 0 2 10 100 0</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 4 0 9 2 0 2 10 100 0</para>
+ </caption>
+ </mediaobject>
- <xi:include href="examples-xml/gen02.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- </example>
</para>
</refsect1>
diff --git a/scoregens/gen03.xml b/scoregens/gen03.xml
index fbc1d17..e17fc3a 100644
--- a/scoregens/gen03.xml
+++ b/scoregens/gen03.xml
@@ -68,31 +68,89 @@
</note>
</refsect1>
- <refsect1>
+ <refsect1>
<title>Examples</title>
<para>
- Here is a simple example of the GEN03 routine. It uses the files <ulink url="examples/gen03.csd"><citetitle>gen03.csd</citetitle></ulink>. It fills a table with a 4th order polynomial function over the x-interval -1 to 1. The origin will be at the offset position 512. The function is post-normalized. Here is its diagram:
+ Here is an example of the GEN03 opcode. It uses the file <ulink url="examples/gen03.csd"><citetitle>gen03.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the GEN03 opcode.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/gen03.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ <textobject>
+ <phrase>These are the diagrams of the waveforms of the GEN03 routines, as used in the example:</phrase>
+ </textobject>
<mediaobject>
<imageobject>
- <imagedata fileref="images/gen03.png" format="PNG"/>
+ <imagedata fileref="images/gen03_1.png" format="PNG"/>
</imageobject>
<textobject>
- <phrase>Diagram of the waveform generated by GEN03.</phrase>
+ <phrase>f4 0 513 3 1 1 0 1 - first-order Chebyshev: x</phrase>
</textobject>
<caption>
- <para>Diagram of the waveform generated by GEN03.</para>
+ <para>f4 0 513 3 1 1 0 1 - first-order Chebyshev: x</para>
</caption>
</mediaobject>
- <example>
- <title>A simple example of the GEN03 routine.</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen03_2.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f6 0 513 3 -1 1 -1 0 2 - second-order Chebyshev: 2x2 - 1</phrase>
+ </textobject>
- <xi:include href="examples-xml/gen03.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <caption>
+ <para>f6 0 513 3 -1 1 -1 0 2 - second-order Chebyshev: 2x2 - 1</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen03_3.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f8 0 513 3 -1 1 0 -3 0 4 - third-order Chebyshev: 4x3 - 3x</phrase>
+ </textobject>
+
+ <caption>
+ <para>f8 0 513 3 -1 1 0 -3 0 4 - third-order Chebyshev: 4x3 - 3x</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen03_4.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f10 0 513 3 -1 10 0 -7 0 56 0 -112 0 64 - seventh-order Chebyshev: 64x7 - 112x5 + 56x3 - 7x</phrase>
+ </textobject>
+
+ <caption>
+ <para>f10 0 513 3 -1 10 0 -7 0 56 0 -112 0 64 - seventh-order Chebyshev: 64x7 - 112x5 + 56x3 - 7x</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen03_5.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f12 0 513 3 -1 1 5 4 3 2 2 1 - a 4th order polynomial function over the x-interval -1 to 1</phrase>
+ </textobject>
+
+ <caption>
+ <para>f12 0 513 3 -1 1 5 4 3 2 2 1 - a 4th order polynomial function over the x-interval -1 to 1</para>
+ </caption>
+ </mediaobject>
- </example>
</para>
</refsect1>
@@ -102,6 +160,7 @@
<link linkend="GEN13"><citetitle>GEN13</citetitle></link>,
<link linkend="GEN14"><citetitle>GEN14</citetitle></link>, and
<link linkend="GEN15"><citetitle>GEN15</citetitle></link>.
+ <para> Information about the Chebyshev polynomials on Wikipedia: <ulink url="http://en.wikipedia.org/wiki/Chebyshev_polynomials"><citetitle>http://en.wikipedia.org/wiki/Chebyshev_polynomials</citetitle></ulink></para>
</para>
</refsect1>
</refentry>
diff --git a/scoregens/gen04.xml b/scoregens/gen04.xml
index 2c1c4ed..fd9a5a6 100644
--- a/scoregens/gen04.xml
+++ b/scoregens/gen04.xml
@@ -63,15 +63,76 @@
</para>
</note>
</refsect1>
-
+
<refsect1>
<title>Examples</title>
<para>
- <informalexample>
- <programlisting><emphasis role="stamnt">f</emphasis> 2 0 512 4 1 1</programlisting>
- </informalexample>
+ Here is a simple example of the GEN04 routine. It uses the files <ulink url="examples/gen04.csd"><citetitle>gen04.csd</citetitle></ulink>.
+ <example>
+ <title>An example of the GEN04 routine.</title>
+ <xi:include href="examples-xml/gen04.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+
+ <textobject>
+ <phrase>These are the diagrams of the waveforms of the GEN04 routines, as used in the example:</phrase>
+ </textobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen04_1.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f1 0 64 21 6 - Gaussian (random) distribution</phrase>
+ </textobject>
+
+ <caption>
+ <para>f1 0 64 21 6 - Gaussian (random) distribution</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen04_2.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f2 0 33 4 1 1 - AND its normalizing function with midpoint bipolar offset</phrase>
+ </textobject>
+
+ <caption>
+ <para>f2 0 33 4 1 1 - AND its normalizing function with midpoint bipolar offset</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen04_3.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f3 0 1025 13 1 1 0 5 0 5 0 10 - Chebyshev algorithm</phrase>
+ </textobject>
+
+ <caption>
+ <para>f3 0 1025 13 1 1 0 5 0 5 0 10 - Chebyshev algorithm</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen04_4.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f4 0 513 4 3 1 - AND its normalizing function with midpoint bipolar offset</phrase>
+ </textobject>
+
+ <caption>
+ <para>f4 0 513 4 3 1 - AND its normalizing function with midpoint bipolar offset</para>
+ </caption>
+ </mediaobject>
- This creates a normalizing function for use in connection with the <link linkend="GEN03"><citetitle>GEN03</citetitle></link> table 1 example. Midpoint bipolar offset is specified.
</para>
</refsect1>
</refentry>
diff --git a/scoregens/gen05.xml b/scoregens/gen05.xml
index 5627c51..96fe511 100644
--- a/scoregens/gen05.xml
+++ b/scoregens/gen05.xml
@@ -35,7 +35,7 @@
</para>
<para>
- <emphasis>n1, n2</emphasis>, etc. -- length of segment (no. of storage locations), in even-numbered pfields. Cannot be negative, but a zero is meaningful for specifying discontinuous waveforms (e.g. in the example below). The sum <emphasis>n1</emphasis> + <emphasis>n2</emphasis> + .... will normally equal <emphasis>size</emphasis> for fully specified functions. If the sum is smaller, the function locations not included will be set to zero; if the sum is greater, only the first <emphasis>size</emphasis> locations will be stored.
+ <emphasis>n1, n2</emphasis>, etc. -- length of segment (no. of storage locations), in even-numbered pfields. Cannot be negative, but a zero is meaningful for specifying discontinuous waveforms. The sum <emphasis>n1</emphasis> + <emphasis>n2</emphasis> + .... will normally equal <emphasis>size</emphasis> for fully specified functions. If the sum is smaller, the function locations not included will be set to zero; if the sum is greater, only the first <emphasis>size</emphasis> locations will be stored.
</para>
<note>
@@ -61,28 +61,44 @@
<refsect1>
<title>Examples</title>
<para>
- Here is a simple example of the GEN05 routine. It uses the files <ulink url="examples/gen05.csd"><citetitle>gen05.csd</citetitle></ulink>. It will create a nice percussive amplitude envelope. Here is its diagram:
+ Here is a simple example of the GEN05 routine. It uses the files <ulink url="examples/gen05.csd"><citetitle>gen05.csd</citetitle></ulink>.
+ <example>
+ <title>An example of the GEN05 routine.</title>
+ <xi:include href="examples-xml/gen05.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+
+ <textobject>
+ <phrase>These are the diagrams of the waveforms of the GEN05 routines, as used in the example:</phrase>
+ </textobject>
<mediaobject>
<imageobject>
- <imagedata fileref="images/gen05.png" format="PNG"/>
+ <imagedata fileref="images/gen05_1.png" format="PNG"/>
</imageobject>
<textobject>
- <phrase>Diagram of the waveform generated by GEN05.</phrase>
+ <phrase>f 2 0 129 5 1 100 0.0001 29 - waveform that goes over 100 points from 1 to 0.0001, stay there for 29 points</phrase>
</textobject>
<caption>
- <para>Diagram of the waveform generated by GEN05.</para>
+ <para>f 2 0 129 5 1 100 0.0001 29 - waveform that goes over 100 points from 1 to 0.0001, stay there for 29 points</para>
</caption>
</mediaobject>
- <example>
- <title>A simple example of the GEN05 routine.</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen05_2.png" format="PNG"/>
+ </imageobject>
- <xi:include href="examples-xml/gen05.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <textobject>
+ <phrase>f 3 0 129 5 0.00001 87 1 22 .5 20 0.0001 - waveform that goes from 0.00001 to 1 in 87 points, then from 1 to .5 in 22 points and then from .5 to 0.0001 in 20 points</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 3 0 129 5 0.00001 87 1 22 .5 20 0.0001 - waveform that goes from 0.00001 to 1 in 87 points, then from 1 to .5 in 22 points and then from .5 to 0.0001 in 20 points</para>
+ </caption>
+ </mediaobject>
- </example>
</para>
</refsect1>
@@ -95,8 +111,4 @@
</para>
</refsect1>
- <refsect1>
- <title>Credits</title>
- <para>Example written by &namekevin;</para>
- </refsect1>
</refentry>
diff --git a/scoregens/gen06.xml b/scoregens/gen06.xml
index aef0a8c..c2e7459 100644
--- a/scoregens/gen06.xml
+++ b/scoregens/gen06.xml
@@ -49,34 +49,52 @@
</para>
</note>
</refsect1>
-
+
<refsect1>
<title>Examples</title>
<para>
- Here is a simple example of the GEN06 routine. It uses the files <ulink url="examples/gen06.csd"><citetitle>gen06.csd</citetitle></ulink>. It creates a curve running 0 to 1 to -1, with a minimum, maximum and minimum at these values respectively. Inflexions are at .5 and 0 and are relatively smooth. Here is its diagram:
+ Here is an example of the GEN06 routine. It uses the files <ulink url="examples/gen06.csd"><citetitle>gen06.csd</citetitle></ulink>.
+ <example>
+ <title>An example of the GEN06 routine.</title>
+ <xi:include href="examples-xml/gen06.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+
+ <textobject>
+ <phrase>These are the diagrams of the waveforms of the GEN06 routines, as used in the example:</phrase>
+ </textobject>
<mediaobject>
<imageobject>
- <imagedata fileref="images/gen06.png" format="PNG"/>
+ <imagedata fileref="images/gen06_1.png" format="PNG"/>
</imageobject>
<textobject>
- <phrase>Diagram of the waveform generated by GEN06.</phrase>
+ <phrase>f 2 0 513 6 1 128 -1 128 1 64 -.5 64 .5 16 -.5 8 1 16 -.5 8 1 16 -.5 84 1 16 -.5 8 .1 16 -.1 17 0 - a not-so-smooth curve</phrase>
</textobject>
<caption>
- <para>Diagram of the waveform generated by GEN06.</para>
+ <para>f 2 0 513 6 1 128 -1 128 1 64 -.5 64 .5 16 -.5 8 1 16 -.5 8 1 16 -.5 84 1 16 -.5 8 .1 16 -.1 17 0 - a not-so-smooth curve</para>
</caption>
</mediaobject>
- <example>
- <title>A simple example of the GEN06 routine.</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen06_2.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 3 0 513 6 0 128 0.5 128 1 128 0 129 -1 - a curve running 0 to 1 to -1, with a minimum, maximum and minimum at these values respectively. Inflexions are at .5 and 0 and are relatively smooth</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 3 0 513 6 0 128 0.5 128 1 128 0 129 -1 - a curve running 0 to 1 to -1, with a minimum, maximum and minimum at these values respectively. Inflexions are at .5 and 0 and are relatively smooth</para>
+ </caption>
+ </mediaobject>
- <xi:include href="examples-xml/gen06.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- </example>
</para>
</refsect1>
+
<refsect1>
<title>See Also</title>
<para>
diff --git a/scoregens/gen07.xml b/scoregens/gen07.xml
index a688fb5..5186305 100644
--- a/scoregens/gen07.xml
+++ b/scoregens/gen07.xml
@@ -61,28 +61,58 @@
<refsect1>
<title>Examples</title>
<para>
- Here is a simple example of the GEN07 routine. It uses the file <ulink url="examples/gen07.csd"><citetitle>gen07.csd</citetitle></ulink>. It will create a single-cycle sawtooth whose discontinuity is mid-way in the stored function. Here is its diagram:
+ Here is an example of the GEN07 routine. It uses the files <ulink url="examples/gen07.csd"><citetitle>gen07.csd</citetitle></ulink>.
+ <example>
+ <title>An example of the GEN07 routine.</title>
+ <xi:include href="examples-xml/gen07.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+
+ <textobject>
+ <phrase>These are the diagrams of the waveforms of the GEN07 routines, as used in the example:</phrase>
+ </textobject>
+
<mediaobject>
<imageobject>
- <imagedata fileref="images/gen07.png" format="PNG"/>
+ <imagedata fileref="images/gen07_1.png" format="PNG"/>
</imageobject>
<textobject>
- <phrase>Diagram of the waveform generated by GEN07.</phrase>
+ <phrase>f 2 0 1024 7 0 512 1 0 -1 512 0 - sawtooth up and down, starting and ending at 0</phrase>
</textobject>
<caption>
- <para>Diagram of the waveform generated by GEN07.</para>
+ <para>f 2 0 1024 7 0 512 1 0 -1 512 0 - sawtooth up and down, starting and ending at 0</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen07_2.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 3 0 1024 7 1 512 1 0 -1 512 -1 - a square from positive to negative</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 3 0 1024 7 1 512 1 0 -1 512 -1 - a square from positive to negative</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen07_3.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 4 0 1024 7 1 1024 -1 - sawtooth down, a straight line from positive to negative</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 4 0 1024 7 1 1024 -1 - sawtooth down, a straight line from positive to negative</para>
</caption>
</mediaobject>
- <example>
- <title>A simple example of the GEN07 routine.</title>
- <para>
- See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.
- </para>
- <xi:include href="examples-xml/gen07.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- </example>
</para>
</refsect1>
diff --git a/scoregens/gen08.xml b/scoregens/gen08.xml
index 5a2d600..199a8c2 100644
--- a/scoregens/gen08.xml
+++ b/scoregens/gen08.xml
@@ -61,30 +61,48 @@
<refsect1>
<title>Examples</title>
<para>
- Here is a simple example of the GEN08 routine. It uses the file <ulink url="examples/gen08.csd"><citetitle>gen08.csd</citetitle></ulink>. It will create a curve with a smooth hump in the middle, going briefly negative outside the hump then flat at its ends. Here is its diagram:
+ Here is an example of the GEN08 routine. It uses the files <ulink url="examples/gen08.csd"><citetitle>gen08.csd</citetitle></ulink>.
+ <example>
+ <title>An example of the GEN08 routine.</title>
+ <xi:include href="examples-xml/gen08.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+
+ <textobject>
+ <phrase>These are the diagrams of the waveforms of the GEN08 routines, as used in the example:</phrase>
+ </textobject>
+
<mediaobject>
<imageobject>
- <imagedata fileref="images/gen08.png" format="PNG"/>
+ <imagedata fileref="images/gen08_1.png" format="PNG"/>
</imageobject>
<textobject>
- <phrase>Diagram of the waveform generated by GEN08.</phrase>
+ <phrase>f 2 0 65 8 0 16 1 16 1 16 0 17 0 - a curve with a smooth hump in the middle, going briefly negative outside the hump then flat at its ends</phrase>
</textobject>
<caption>
- <para>Diagram of the waveform generated by GEN08.</para>
+ <para>f 2 0 65 8 0 16 1 16 1 16 0 17 0 - a curve with a smooth hump in the middle, going briefly negative outside the hump then flat at its ends</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen08_2.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 3 0 65 8 -1 32 1 2 0 14 0 17 0 - from a negative value,a curve with a smooth hump, going negative creating a small hump then flat at its ends</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 3 0 65 8 -1 32 1 2 0 14 0 17 0 - from a negative value,a curve with a smooth hump, going negative creating a small hump then flat at its ends</para>
</caption>
</mediaobject>
- <example>
- <title>A simple example of the GEN08 routine.</title>
- <para>
- See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
- <xi:include href="examples-xml/gen08.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- </example>
</para>
</refsect1>
+
<refsect1>
<title>See Also</title>
<para>
diff --git a/scoregens/gen09.xml b/scoregens/gen09.xml
index c59e757..adef75f 100644
--- a/scoregens/gen09.xml
+++ b/scoregens/gen09.xml
@@ -63,51 +63,74 @@
<refsect1>
<title>Examples</title>
<para>
- Here is a simple example of the GEN09 routine. It uses the file <ulink url="examples/gen09.csd"><citetitle>gen09.csd</citetitle></ulink>. It will generate a cosine wave, a sine wave with an initial phase of 90 degrees. Here is its diagram:
+ Here is an example of the GEN09 routine. It uses the files <ulink url="examples/gen09.csd"><citetitle>gen09.csd</citetitle></ulink>.
+
+ <example>
+ <title>Example of the GEN09 routine.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/gen09.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+
+ <textobject>
+ <phrase>These are the diagrams of the waveforms of the GEN09 routines, as used in the example:</phrase>
+ </textobject>
+
<mediaobject>
<imageobject>
- <imagedata fileref="images/gen09.png" format="PNG"/>
+ <imagedata fileref="images/gen09_1.png" format="PNG"/>
</imageobject>
<textobject>
- <phrase>Diagram of the waveform generated by GEN09.</phrase>
+ <phrase>gi1 ftgen 1,0,2^10,9, 1,3,0, 3,1,0, 9,0.333,180 - approximation of a square wave</phrase>
</textobject>
<caption>
- <para>Diagram of the waveform generated by GEN09.</para>
+ <para>gi1 ftgen 1,0,2^10,9, 1,3,0, 3,1,0, 9,0.333,180 - approximation of a square wave</para>
</caption>
</mediaobject>
- <example>
- <title>A simple example of the GEN09 routine.</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen09_2.png" format="PNG"/>
+ </imageobject>
- <para>
- See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.
- </para>
- <xi:include href="examples-xml/gen09.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- </example>
- </para>
+ <textobject>
+ <phrase>gi2 ftgen 2,0,2^10,9, 1,3,180, 3,1,0, 9,0.333,0 - same values as gi1, except phase value</phrase>
+ </textobject>
+
+ <caption>
+ <para>gi2 ftgen 2,0,2^10,9, 1,3,180, 3,1,0, 9,0.333,0 - same values as gi1, except phase value</para>
+ </caption>
+ </mediaobject>
- <para>
- Here is another example of the GEN09 routine. It uses the file <ulink url="examples/gen09square.csd"><citetitle>gen09square.csd</citetitle></ulink>. It combines partials l, 3 and 9 in the relative strengths in which they are found in a square wave, except that partial 9 is upside down. It will be rescaled, here is its diagram:
<mediaobject>
<imageobject>
- <imagedata fileref="images/gen09square.png" format="PNG"/>
+ <imagedata fileref="images/gen09_3.png" format="PNG"/>
</imageobject>
<textobject>
- <phrase>Diagram of the waveform generated by GEN09.</phrase>
+ <phrase>gi3 ftgen 3,0,2^10,9, 1,2,0, 3,2,0, 9,0.333,180 - inharmonic partials, but with distortion due to the sudden jump in ending and beginning of the wave</phrase>
</textobject>
<caption>
- <para>Diagram of the waveform generated by GEN09.</para>
+ <para>gi3 ftgen 3,0,2^10,9, 1,2,0, 3,2,0, 9,0.333,180 - inharmonic partials, but with distortion due to the sudden jump in ending and beginning of the wave</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen09_4.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>gi4 ftgen 4,0,2^10,9, 1,2,180, 3,2,0, 9,0.333,0 - same ratio as gi3, except with less artefacts</phrase>
+ </textobject>
+
+ <caption>
+ <para>gi4 ftgen 4,0,2^10,9, 1,2,180, 3,2,0, 9,0.333,0 - same ratio as gi3, except with less artefacts</para>
</caption>
</mediaobject>
- <example>
- <title>A square wave generated by the GEN09 routine.</title>
- <xi:include href="examples-xml/gen09square.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- </example>
</para>
</refsect1>
@@ -119,8 +142,4 @@
</para>
</refsect1>
- <refsect1>
- <title>Credits</title>
- <para>The simple example was written by &namekevin;.</para>
- </refsect1>
</refentry>
diff --git a/scoregens/gen10.xml b/scoregens/gen10.xml
index d75188f..8fa5403 100644
--- a/scoregens/gen10.xml
+++ b/scoregens/gen10.xml
@@ -55,28 +55,71 @@
<refsect1>
<title>Examples</title>
<para>
- Here is a simple example of the GEN10 routine. It uses the file <ulink url="examples/gen10.csd"><citetitle>gen10.csd</citetitle></ulink>. It will generate a simple sine wave. Here is its diagram:
+ Here is an example of the GEN10 routine. It uses the files <ulink url="examples/gen10.csd"><citetitle>gen10.csd</citetitle></ulink>.
+ <example>
+ <title>An example of the GEN10 routine.</title>
+ <xi:include href="examples-xml/gen10.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+
+ <textobject>
+ <phrase>These are the diagrams of the waveforms of the GEN10 routines, as used in the example:</phrase>
+ </textobject>
+
<mediaobject>
<imageobject>
- <imagedata fileref="images/gen10.png" format="PNG"/>
+ <imagedata fileref="images/gen10_1.png" format="PNG"/>
</imageobject>
<textobject>
- <phrase>Diagram of the waveform generated by GEN10.</phrase>
+ <phrase>f 1 0 16384 10 1 - sine wave with only the fundamental frequency</phrase>
</textobject>
<caption>
- <para>Diagram of the waveform generated by GEN10.</para>
+ <para>f 1 0 16384 10 1 - sine wave with only the fundamental frequency</para>
</caption>
</mediaobject>
- <example>
- <title>A simple example of the GEN10 routine.</title>
- <para>
- See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.
- </para>
- <xi:include href="examples-xml/gen10.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- </example>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen10_2.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 2 0 16384 10 1 0.5 0.3 0.25 0.2 0.167 0.14 0.125 .111 - sawtooth, with a fundamental and 8 harmonics </phrase>
+ </textobject>
+
+ <caption>
+ <para>f 2 0 16384 10 1 0.5 0.3 0.25 0.2 0.167 0.14 0.125 .111 - sawtooth, with a fundamental and 8 harmonics </para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen10_3.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 3 0 16384 10 1 0 0.3 0 0.2 0 0.14 0 .111 - square wave, with a fundamental and 8 harmonics but 4 have 0 strength</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 3 0 16384 10 1 0 0.3 0 0.2 0 0.14 0 .111 - square wave, with a fundamental and 8 harmonics but 4 have 0 strength</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen10_4.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 4 0 16384 10 1 1 1 1 0.7 0.5 0.3 0.1 - pulse wave, with a fundamental and 8 harmonics</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 4 0 16384 10 1 1 1 1 0.7 0.5 0.3 0.1 - pulse wave, with a fundamental and 8 harmonics</para>
+ </caption>
+ </mediaobject>
</para>
</refsect1>
@@ -89,8 +132,4 @@
</para>
</refsect1>
- <refsect1>
- <title>Credits</title>
- <para>Example written by &namekevin;</para>
- </refsect1>
</refentry>
diff --git a/scoregens/gen11.xml b/scoregens/gen11.xml
index f09e4dd..9127421 100644
--- a/scoregens/gen11.xml
+++ b/scoregens/gen11.xml
@@ -65,28 +65,58 @@
<refsect1>
<title>Examples</title>
<para>
- Here is a simple example of the GEN11 routine. It uses the file <ulink url="examples/gen11.csd"><citetitle>gen11.csd</citetitle></ulink>. It will generate a simple cosine wave. Here is its diagram:
+ Here is an example of the GEN11 routine. It uses the files <ulink url="examples/gen01.csd"><citetitle>gen11.csd</citetitle></ulink>.
+ <example>
+ <title>An example of the GEN11 routine.</title>
+ <xi:include href="examples-xml/gen11.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+
+ <textobject>
+ <phrase>These are the diagrams of the waveforms of the GEN11 routines, as used in the example:</phrase>
+ </textobject>
+
<mediaobject>
<imageobject>
- <imagedata fileref="images/gen11.png" format="PNG"/>
+ <imagedata fileref="images/gen11_1.png" format="PNG"/>
</imageobject>
<textobject>
- <phrase>Diagram of the waveform generated by GEN11.</phrase>
+ <phrase>f 1 0 16384 11 1 1</phrase>
</textobject>
<caption>
- <para>Diagram of the waveform generated by GEN11.</para>
+ <para>f 1 0 16384 11 1 1</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen11_2.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 2 0 16384 11 10 1 .7</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 2 0 16384 11 10 1 .7</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen11_3.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 3 0 16384 11 10 5 2</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 3 0 16384 11 10 5 2</para>
</caption>
</mediaobject>
- <example>
- <title>A simple example of the GEN11 routine.</title>
- <para>
- See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.
- </para>
- <xi:include href="examples-xml/gen11.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- </example>
</para>
</refsect1>
@@ -97,8 +127,4 @@
</para>
</refsect1>
- <refsect1>
- <title>Credits</title>
- <para>Example written by &namekevin;</para>
- </refsect1>
</refentry>
diff --git a/scoregens/gen12.xml b/scoregens/gen12.xml
index 688e197..34327b1 100644
--- a/scoregens/gen12.xml
+++ b/scoregens/gen12.xml
@@ -53,11 +53,19 @@
</para>
</note>
</refsect1>
-
- <refsect1>
+
+ <refsect1>
<title>Examples</title>
<para>
- Here is a simple example of the GEN12 routine. It uses the file <ulink url="examples/gen12.csd"><citetitle>gen12.csd</citetitle></ulink>. It generates the function <emphasis>ln</emphasis>(<emphasis>I<subscript>0</subscript></emphasis>(<emphasis>x</emphasis>)) from 0 to 20. Here is its diagram:
+ Here is an example of the GEN12 opcode. It uses the file <ulink url="examples/gen12.csd"><citetitle>gen12.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the GEN12 opcode.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/gen12.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ <textobject>
+ <phrase>This is the diagram of the waveform of the GEN12 routines, as used in the example:</phrase>
+ </textobject>
<mediaobject>
<imageobject>
@@ -65,26 +73,21 @@
</imageobject>
<textobject>
- <phrase>Diagram of the waveform generated by GEN12.</phrase>
+ <phrase>f 37 0 1024 -12 40 - Bessel function-defined from 0 to 40</phrase>
</textobject>
<caption>
- <para>Diagram of the waveform generated by GEN12.</para>
+ <para>f 37 0 1024 -12 40 - Bessel function-defined from 0 to 40</para>
</caption>
</mediaobject>
-
- <example>
- <title>A simple example of the GEN12 routine.</title>
- <para>
- See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.
- </para>
- <xi:include href="examples-xml/gen12.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- </example>
+
</para>
</refsect1>
-
+
<refsect1>
<title>Credits</title>
- <para>Example written by &namekevin;</para>
+ <para>
+ Example is, with minor modifications, taken from The Csound Book (page 87).
+ </para>
</refsect1>
</refentry>
diff --git a/scoregens/gen13.xml b/scoregens/gen13.xml
index b888dce..e4b98d6 100644
--- a/scoregens/gen13.xml
+++ b/scoregens/gen13.xml
@@ -52,33 +52,118 @@ xamp * int(size/2)/xint
<emphasis>GEN13</emphasis> is the function generator normally employed in standard waveshaping. It stores a polynomial whose coefficients derive from the Chebyshev polynomials of the first kind, so that a driving sinusoid of strength <emphasis>xamp</emphasis> will exhibit the specified spectrum at output. Note that the evolution of this spectrum is generally not linear with varying <emphasis>xamp</emphasis>. However, it is bandlimited (the only partials to appear will be those specified at generation time); and the partials will tend to occur and to develop in ascending order (the lower partials dominating at low <emphasis>xamp</emphasis>, and the spectral richness increasing for higher values of <emphasis>xamp</emphasis>). A negative <emphasis>hn</emphasis> value implies a 180 degree phase shift of that partial; the requested full-amplitude spectrum will not be affected by this shift, although the evolution of several of its component partials may be. The pattern +,+,-,-,+,+,... for <emphasis>h0,h1,h2..</emphasis>. will minimize the normalization problem for low <emphasis>xamp</emphasis> values (see above), but does not necessarily provide the smoothest pattern of evolution.
</para>
</refsect1>
-
- <refsect1>
+
+ <refsect1>
<title>Examples</title>
<para>
- Here is a simple example of the GEN13 routine. It uses the file <ulink url="examples/gen13.csd"><citetitle>gen13.csd</citetitle></ulink>. It creates a function which, under waveshaping, will split a sinusoid into 3 odd-harmonic partials of relative strength 5:3:1. Here is its diagram:
+ Here is an example of the GEN13 opcode. It uses the file <ulink url="examples/gen13.csd"><citetitle>gen13.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the GEN13 opcode.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/gen13.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ <textobject>
+ <phrase>These are the diagrams of the waveforms of the GEN13 routines, as used in the example:</phrase>
+ </textobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen13_1.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f1 0 513 13 1 1 0 100 -50 -33 25 20 -16.7 -14.2 12.5 11.1 -10 -9.09 8.333 7.69 -7.14 -6.67 6.25 5.88 -5.55 -5.26 5 - quasi sawtooth transfer function</phrase>
+ </textobject>
+
+ <caption>
+ <para>f1 0 513 13 1 1 0 100 -50 -33 25 20 -16.7 -14.2 12.5 11.1 -10 -9.09 8.333 7.69 -7.14 -6.67 6.25 5.88 -5.55 -5.26 5 - quasi sawtooth transfer function</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen13_2.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f3 0 513 13 1 1 0 100 0 -33 0 20 0 -14.2 0 11.1 0 -9.09 0 7.69 0 -6.67 0 5.88 0 -5.26 - quasi square wave transfer function</phrase>
+ </textobject>
+
+ <caption>
+ <para>f3 0 513 13 1 1 0 100 0 -33 0 20 0 -14.2 0 11.1 0 -9.09 0 7.69 0 -6.67 0 5.88 0 -5.26 - quasi square wave transfer function</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen13_3.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f5 0 513 13 1 1 0 100 0 -11.11 0 4 0 -2.04 0 1.23 0 -.826 0 .59 0 -.444 0 .346 0 -.277 - quasi triangle wave transfer function</phrase>
+ </textobject>
+
+ <caption>
+ <para>f5 0 513 13 1 1 0 100 0 -11.11 0 4 0 -2.04 0 1.23 0 -.826 0 .59 0 -.444 0 .346 0 -.277 - quasi triangle wave transfer function</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen13_4.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f7 0 513 13 1 1 0 1 -.8 0 .6 0 0 0 .4 0 0 0 0 .1 -.2 -.3 .5 - transfer function 1</phrase>
+ </textobject>
+
+ <caption>
+ <para>f7 0 513 13 1 1 0 1 -.8 0 .6 0 0 0 .4 0 0 0 0 .1 -.2 -.3 .5 - transfer function 1</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen13_5.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f9 0 513 13 1 1 0 0 0 -.1 0 .3 0 -.5 0 .7 0 -.9 0 1 0 -1 0 - transfer function 2</phrase>
+ </textobject>
+
+ <caption>
+ <para>f9 0 513 13 1 1 0 0 0 -.1 0 .3 0 -.5 0 .7 0 -.9 0 1 0 -1 0 - transfer function 2</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen13_6.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f11 0 513 13 1 1 0 0 0 0 0 0 0 -1 0 1 0 0 -.1 0 .1 0 -.2 .3 0 -.7 0 .2 0 -.1 - transfer function 3</phrase>
+ </textobject>
+
+ <caption>
+ <para>f11 0 513 13 1 1 0 0 0 0 0 0 0 -1 0 1 0 0 -.1 0 .1 0 -.2 .3 0 -.7 0 .2 0 -.1 - transfer function 3</para>
+ </caption>
+ </mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="images/gen13.png" format="PNG"/>
+ <imagedata fileref="images/gen13_7.png" format="PNG"/>
</imageobject>
<textobject>
- <phrase>Diagram of the waveform generated by GEN13.</phrase>
+ <phrase>f13 0 513 13 1 1 0 5 0 3 0 1 - split a sinusoid into 3 odd-harmonic partials of relative strength 5:3:1</phrase>
</textobject>
<caption>
- <para>Diagram of the waveform generated by GEN13.</para>
+ <para>f13 0 513 13 1 1 0 5 0 3 0 1 - split a sinusoid into 3 odd-harmonic partials of relative strength 5:3:1</para>
</caption>
</mediaobject>
- <example>
- <title>A simple example of the GEN13 routine.</title>
- <para>
- See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.
- </para>
- <xi:include href="examples-xml/gen13.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- </example>
</para>
</refsect1>
@@ -88,6 +173,7 @@ xamp * int(size/2)/xint
<link linkend="GEN03"><citetitle>GEN03</citetitle></link>,
<link linkend="GEN14"><citetitle>GEN14</citetitle></link>, and
<link linkend="GEN15"><citetitle>GEN15</citetitle></link>.
+ <para> Information about the Chebyshev polynomials on Wikipedia: <ulink url="http://en.wikipedia.org/wiki/Chebyshev_polynomials"><citetitle>http://en.wikipedia.org/wiki/Chebyshev_polynomials</citetitle></ulink></para>
</para>
</refsect1>
</refentry>
diff --git a/scoregens/gen14.xml b/scoregens/gen14.xml
index 4856632..8b63026 100644
--- a/scoregens/gen14.xml
+++ b/scoregens/gen14.xml
@@ -67,47 +67,87 @@ xamp * int(size/2)/xint
</para>
</note>
</refsect1>
-
- <refsect1>
+
+ <refsect1>
<title>Examples</title>
<para>
- Here is a simple example of the GEN14 routine. It uses the file <ulink url="examples/gen14.csd"><citetitle>gen14.csd</citetitle></ulink>. It creates a function which, under waveshaping, will split a sinusoid into 3 odd-harmonic partials of relative strength 5:3:1. Here is its diagram:
+ Here is an example of the GEN14 opcode. It uses the file <ulink url="examples/gen14.csd"><citetitle>gen14.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the GEN14 opcode.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/gen14.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ <textobject>
+ <phrase>These are the diagrams of the waveforms of the GEN14 routines, as used in the example:</phrase>
+ </textobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen14_1.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f28 0 4097 13 1 1 1 0 .8 0 .5 0 .2 - waveshaping function: GEN13, odd harmonics</phrase>
+ </textobject>
+
+ <caption>
+ <para>f28 0 4097 13 1 1 1 0 .8 0 .5 0 .2 - waveshaping function: GEN13, odd harmonics</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen14_2.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f29 0 4097 14 1 1 1 0 .8 0 .5 0 .2 - waveshaping function: GEN14, the same odd harmonics</phrase>
+ </textobject>
+
+ <caption>
+ <para>f29 0 4097 14 1 1 1 0 .8 0 .5 0 .2 - waveshaping function: GEN14, the same odd harmonics</para>
+ </caption>
+ </mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="images/gen14.png" format="PNG"/>
+ <imagedata fileref="images/gen14_3.png" format="PNG"/>
</imageobject>
<textobject>
- <phrase>Diagram of the waveform generated by GEN14.</phrase>
+ <phrase>f30 0 4097 13 1 1 0 1 0 .6 0 .4 0 .1 - waveshaping function: GEN13, even harmonics</phrase>
</textobject>
<caption>
- <para>Diagram of the waveform generated by GEN14.</para>
+ <para>f30 0 4097 13 1 1 0 1 0 .6 0 .4 0 .1 - waveshaping function: GEN13, even harmonics</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen14_4.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f31 0 4097 14 1 1 0 1 0 .6 0 .4 0 .1 - waveshaping function: GEN14, the same even harmonics</phrase>
+ </textobject>
+
+ <caption>
+ <para>f31 0 4097 14 1 1 0 1 0 .6 0 .4 0 .1 - waveshaping function: GEN14, the same even harmonics</para>
</caption>
</mediaobject>
- <example>
- <title>A simple example of the GEN14 routine.</title>
- <para>
- See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.
- </para>
- <xi:include href="examples-xml/gen14.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- </example>
</para>
</refsect1>
+
<refsect1>
<title>See Also</title>
<para>
<link linkend="GEN03"><citetitle>GEN03</citetitle></link>,
<link linkend="GEN13"><citetitle>GEN13</citetitle></link>, and
<link linkend="GEN15"><citetitle>GEN15</citetitle></link>.
+ <para> Information about the Chebyshev polynomials on Wikipedia: <ulink url="http://en.wikipedia.org/wiki/Chebyshev_polynomials"><citetitle>http://en.wikipedia.org/wiki/Chebyshev_polynomials</citetitle></ulink></para>
</para>
</refsect1>
-
- <refsect1>
- <title>Credits</title>
- <para>Example written by &namekevin;</para>
- </refsect1>
</refentry>
diff --git a/scoregens/gen15.xml b/scoregens/gen15.xml
index e97d8d1..c3bd263 100644
--- a/scoregens/gen15.xml
+++ b/scoregens/gen15.xml
@@ -53,17 +53,109 @@ xamp * int(size/2)/xint
</para>
<note>
- <title>Note</title>
+ <title>Notes</title>
<para>
- <emphasis>GEN15</emphasis> creates two tables of equal size, labeled <emphasis>f </emphasis># and <emphasis>f</emphasis> # + 1. Table # will contain a Chebyshev function of the first kind, drawn using <link linkend="GEN03"><citetitle>GEN03</citetitle></link> with partial strengths <emphasis>h0cos(phs0), h1cos(phs1), ...</emphasis> Table #+1 will contain a Chebyshev function of the 2nd kind by calling <link linkend="GEN14"><citetitle>GEN14</citetitle></link> with partials <emphasis>h1sin(phs1), h2sin(phs2),...</emphasis> (note the harmonic displacement). The two tables can be used in conjunction in a waveshaping network that exploits phase quadrature.
+ <emphasis>GEN15</emphasis> creates two tables of equal size, labeled <emphasis>f </emphasis># and <emphasis>f</emphasis> # + 1. Table # will contain a Chebyshev function of the first kind, drawn using <link linkend="GEN13"><citetitle>GEN13</citetitle></link> with partial strengths <emphasis>h0cos(phs0), h1cos(phs1), ...</emphasis> Table #+1 will contain a Chebyshev function of the 2nd kind by calling <link linkend="GEN14"><citetitle>GEN14</citetitle></link> with partials <emphasis>h1sin(phs1), h2sin(phs2),...</emphasis> (note the harmonic displacement). The two tables can be used in conjunction in a waveshaping network that exploits phase quadrature.
+ </para>
+ <para>
+ Before version 5.16 there was a bug (pointed out by Menno Knevel and fixed
+ by &namepinot;) on the number of pfields transmitted to gen13 and gen14 by
+ gen15. The consequence is that all the csd, or orc and sco files that used
+ gen15 before this bug was fixed, are likely to sound different now.
</para>
</note>
</refsect1>
<refsect1>
+ <title>Examples</title>
+ <para>
+ Here is an example of the GEN15 routine. It uses the files <ulink url="examples/gen15.csd"><citetitle>gen15.csd</citetitle></ulink>.
+ <example>
+ <title>An example of the GEN15 routine.</title>
+ <xi:include href="examples-xml/gen15.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+
+ <textobject>
+ <phrase>These are the diagrams of the waveforms of the GEN15 routine, as used in the example
+ (in each diagram, the curve in blue is for ftable 33 and the curve in green is for
+ table 34):</phrase>
+ </textobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen15-1.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 33 0 8193 -15 1 1 1 0 1 180 .8 45 .6 270 .5 90 .4 225 .2 135 .1 315</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 33 0 8193 -15 1 1 1 0 1 180 .8 45 .6 270 .5 90 .4 225 .2 135 .1 315</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen15-2.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 33 0 8193 -15 1 1 1 0 1 0 1 180 1 180 1 0 1 0 1 180 1 180 1 0 1 0 1 180 1 180</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 33 0 8193 -15 1 1 1 0 1 0 1 180 1 180 1 0 1 0 1 180 1 180 1 0 1 0 1 180 1 180</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen15-3.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 33 0 8193 -15 1 1 1 0 1 0 .9 180 .5 270 .75 90 .4 45 .2 225 .1 0</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 33 0 8193 -15 1 1 1 0 1 0 .9 180 .5 270 .75 90 .4 45 .2 225 .1 0</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen15-4.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 33 0 8193 -15 1 1 1 0 1 0 .5 0 .9 0 .3 0 .75 0 .2 180 .6 180 .15 180 .5 180 .1 180</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 33 0 8193 -15 1 1 1 0 1 0 .5 0 .9 0 .3 0 .75 0 .2 180 .6 180 .15 180 .5 180 .1 180</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen15-5.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 33 0 8193 -15 1 1 1 180 1 180 .5 180 .9 180 .3 180 .75 180 .2 0 .6 0 .15 0 .5 0 .1 0</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 33 0 8193 -15 1 1 1 180 1 180 .5 180 .9 180 .3 180 .75 180 .2 0 .6 0 .15 0 .5 0 .1 0</para>
+ </caption>
+ </mediaobject>
+ </para>
+ </refsect1>
+
+ <refsect1>
<title>See Also</title>
<para>
- <link linkend="GEN03"><citetitle>GEN03</citetitle></link>,
<link linkend="GEN13"><citetitle>GEN13</citetitle></link>, and
<link linkend="GEN14"><citetitle>GEN14</citetitle></link>.
</para>
diff --git a/scoregens/gen16.xml b/scoregens/gen16.xml
index 2ff0f84..e094f03 100644
--- a/scoregens/gen16.xml
+++ b/scoregens/gen16.xml
@@ -21,15 +21,21 @@
<refsect1>
<title>Syntax</title>
- <synopsis><command>f</command> # time size 16 beg dur type end</synopsis>
+ <synopsis><command>f</command> # time size 16 val1 dur1 type1 val2 [dur2 type2 val3 ... typeX valN]</synopsis>
</refsect1>
<refsect1>
<title>Initialization</title>
<para>
- <emphasis>size</emphasis> -- number of points in the table. Must be a power of 2 or a power-of-2 plus 1 (see <link linkend="f"><citetitle>f statement</citetitle></link>). The normal value is power-of-2 plus 1.
+ <emphasis>size</emphasis> -- number of points in the table. Must
+ be a power of 2 or a power-of-2 plus 1 (see <link
+ linkend="f"><citetitle>f statement</citetitle></link>). The
+ normal value is power-of-2 plus 1.
</para>
-
+ <note>
+ The end value is only reached when the table length is power-of-2 plus 1.
+ (This length is crucial for use with the tab opcode.)
+ </note>
<para>
<emphasis>beg</emphasis> -- starting value
</para>
diff --git a/scoregens/gen17.xml b/scoregens/gen17.xml
index 66911b4..8c536fe 100644
--- a/scoregens/gen17.xml
+++ b/scoregens/gen17.xml
@@ -56,6 +56,32 @@
This describes a step function with 8 successively increasing levels, each 12 locations wide except the last which extends its value to the end of the table. Rescaling is inhibited. Indexing into this table with a MIDI note-number would retrieve a different value every octave up to the eighth, above which the value returned would remain the same.
</para>
+ <para>
+ Here is a complete example of the GEN17 routine. It uses the files <ulink url="examples/gen17.csd"><citetitle>gen17.csd</citetitle></ulink>.
+ <example>
+ <title>An example of the GEN17 routine.</title>
+ <xi:include href="examples-xml/gen17.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+
+ <textobject>
+ <phrase>This is the diagram of the waveform of the GEN17 routine, as used in the example:</phrase>
+ </textobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen17.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 2 0 128 -17 0 10 32 20 64 30 96 40 - a step function with 4 equal levels, each 32 locations wide except the last which extends its value to the end of the table</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 2 0 128 -17 0 10 32 20 64 30 96 40 - a step function with 4 equal levels, each 32 locations wide except the last which extends its value to the end of the table</para>
+ </caption>
+ </mediaobject>
+
+ </para>
</refsect1>
<refsect1>
diff --git a/scoregens/gen18.xml b/scoregens/gen18.xml
index 61a39a2..e20fb71 100644
--- a/scoregens/gen18.xml
+++ b/scoregens/gen18.xml
@@ -27,7 +27,7 @@
<refsect1>
<title>Initialization</title>
<para>
- <emphasis>size</emphasis> -- number of points in the table. Must be a power-of-2 plus 1 (see <link linkend="f">f</link> statement).
+ <emphasis>size</emphasis> -- number of points in the table. Must be a power-of-2 (see <link linkend="f">f</link> statement).
</para>
<para>
@@ -43,7 +43,7 @@
</para>
<para>
- <emphasis>finisha, finishb, etc.</emphasis> -- where to stop writing the fn into the table.
+ <emphasis>finisha, finishb, etc.</emphasis> -- where to stop writing the fn into the table. The last available location is the power of two - 1.
</para>
</refsect1>
@@ -54,10 +54,62 @@
<informalexample>
<programlisting>
<emphasis role="stamnt">f</emphasis> 1 0 4096 10 1
-<emphasis role="stamnt">f</emphasis> 2 0 1025 18 1 1 0 512 1 1 513 1025</programlisting>
+<emphasis role="stamnt">f</emphasis> 2 0 1024 18 1 1 0 511 1 1 512 1023</programlisting>
</informalexample>
- f2 consists of two copies of f1 written in to locations 0-512 and 513-1025.
+ f2 consists of two copies of f1 written in to locations 0-511 and 512-1023.
+ </para>
+ <para>
+ Here is an example of the GEN18 routine. It uses the files <ulink url="examples/gen18.csd"><citetitle>gen18.csd</citetitle></ulink>.
+ <example>
+ <title>An example of the GEN18 routine.</title>
+ <xi:include href="examples-xml/gen18.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+
+ <textobject>
+ <phrase>These are the diagrams of the waveforms generated by GEN18, as used in the example:</phrase>
+ </textobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen18_1.png" format="PNG"/>
+ <textobject>
+ <phrase>f 11 0 8193 18 1 1 0 4096 2 1 4097 8192 - composite waveform made up of a sine wave and a sawtooth</phrase>
+ </textobject>
+ </imageobject>
+
+ <caption>
+ <para>f 11 0 8193 18 1 1 0 4096 2 1 4097 8192 - composite waveform made up of a sine wave and a sawtooth</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen18_2.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 12 0 8192 18 1 1 0 4096 3 1 4097 8192 - composite waveform made up of a sine wave and a wave of cosine partials</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 12 0 8192 18 1 1 0 4096 3 1 4097 8192 - composite waveform made up of a sine wave and a wave of cosine partials</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen18_3.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 13 0 1024 18 1 0.7 0 767 3 0.7 512 1023 - sine+cosine partials overlapped, also shorter table than f12</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 13 0 1024 18 1 0.7 0 767 3 0.7 512 1023 - sine+cosine partials overlapped, also shorter table than f12</para>
+ </caption>
+ </mediaobject>
</para>
</refsect1>
diff --git a/scoregens/gen19.xml b/scoregens/gen19.xml
index f66888c..22b21f9 100644
--- a/scoregens/gen19.xml
+++ b/scoregens/gen19.xml
@@ -63,35 +63,38 @@
</para>
</note>
</refsect1>
-
+
<refsect1>
<title>Examples</title>
<para>
- Here is a simple example of the GEN19 routine. It uses the file <ulink url="examples/gen19.csd"><citetitle>gen19.csd</citetitle></ulink>. It will generate a nice bell curve, here is its diagram:
+ Here is an example of the GEN19 routine. It uses the files <ulink url="examples/gen19.csd"><citetitle>gen19.csd</citetitle></ulink>.
+ <example>
+ <title>An example of the GEN19 routine.</title>
+ <xi:include href="examples-xml/gen19.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+
+ <textobject>
+ <phrase>This is the diagram of the waveform of the GEN19 routines, as used in the example:</phrase>
+ </textobject>
+
<mediaobject>
<imageobject>
- <imagedata fileref="images/gen19.png" format="PNG"/>
+ <imagedata fileref="images/gen19_1.png" format="PNG"/>
</imageobject>
<textobject>
- <phrase>Diagram of the waveform generated by GEN19.</phrase>
+ <phrase>f 2 0 1024 19 .5 .5 270 .5 - a rising sigmoid</phrase>
</textobject>
<caption>
- <para>Diagram of the waveform generated by GEN19.</para>
+ <para>f 2 0 1024 19 .5 .5 270 .5 - a rising sigmoid</para>
</caption>
</mediaobject>
- <example>
- <title>A simple example of the GEN19 routine.</title>
- <para>
- See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.
- </para>
- <xi:include href="examples-xml/gen19.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- </example>
</para>
</refsect1>
+
<refsect1>
<title>See Also</title>
<para>
@@ -100,8 +103,4 @@
</para>
</refsect1>
- <refsect1>
- <title>Credits</title>
- <para>Example written by &namekevin;</para>
- </refsect1>
</refentry>
diff --git a/scoregens/gen20.xml b/scoregens/gen20.xml
index 7745f73..9e13195 100644
--- a/scoregens/gen20.xml
+++ b/scoregens/gen20.xml
@@ -127,10 +127,53 @@
example the s.d. is 2. The default value is 1.
</para>
<para>
- For diagrams, see <link linkend="MiscWindows"><citetitle>Window Functions</citetitle></link>
+ For all diagrams, see <link linkend="MiscWindows"><citetitle>Window Functions</citetitle></link>
+ </para>
+
+ <para>
+ Here is an example of the GEN20 routine. It uses the file <ulink url="examples/gen20.csd"><citetitle>gen20.csd</citetitle></ulink>.
+
+ <example>
+ <title>Example of the GEN20 routine.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/gen20.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ <textobject>
+ <phrase>These are the diagrams of the waveforms of the GEN20 routines, as used in the example:</phrase>
+ </textobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen20_1.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase> f 1 0 512 20 2 - Hanning window</phrase>
+ </textobject>
+
+
+ <caption>
+ <para> f 1 0 512 20 2 - Hanning window</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen20_2.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase> f 2 0 512 20 6 1 - Gaussian window</phrase>
+ </textobject>
+
+ <caption>
+ <para> f 2 0 512 20 6 1 - Gaussian window</para>
+ </caption>
+ </mediaobject>
+
</para>
</refsect1>
-
+
<refsect1>
<title>Credits</title>
<para>
diff --git a/scoregens/gen21.xml b/scoregens/gen21.xml
index 7a3db94..076f03a 100644
--- a/scoregens/gen21.xml
+++ b/scoregens/gen21.xml
@@ -90,8 +90,89 @@
All of the above additions were designed by the author between May and December 1994, under the supervision of Dr. Richard Boulanger.
</para>
+ <para>
+ Here is a complete example of the GEN21 routine. It uses the file <ulink url="examples/gen21.csd"><citetitle>gen21.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the GEN21 routine.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/gen21.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ <textobject>
+ <phrase>These are the diagrams of the waveforms of the GEN21 routines, as used in the example:</phrase>
+ </textobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen21_1.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 1 0 32 21 1 - positive numbers only</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 1 0 32 21 1 - positive numbers only</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen21_2.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 2 0 32 21 6</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 2 0 32 21 6</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen21_3.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 3 0 32 21 6 5.745</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 3 0 32 21 6 5.745</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen21_4.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 4 0 32 21 9 1 1 2 - positive numbers only</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 4 0 32 21 9 1 1 2 - positive numbers only</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen21_5.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 5 0 32 21 10 1 2 - positive numbers only</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 5 0 32 21 10 1 2 - positive numbers only</para>
+ </caption>
+ </mediaobject>
+ </para>
</refsect1>
-
+
<refsect1>
<title>Credits</title>
<para>
diff --git a/scoregens/gen23.xml b/scoregens/gen23.xml
index 44dedc5..6788879 100644
--- a/scoregens/gen23.xml
+++ b/scoregens/gen23.xml
@@ -42,6 +42,35 @@
</note>
</refsect1>
+ <refsect1>
+ <title>Examples</title>
+ <para>
+ Here is an example of the GEN23 opcode. It uses the file <ulink url="examples/gen23.csd"><citetitle>gen23.csd</citetitle></ulink> and <ulink url="examples/spectrum.txt"> <citetitle>spectrum.txt</citetitle></ulink>.
+ <example>
+ <title>Example of the GEN23 opcode.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/gen23.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ <textobject>
+ <phrase>This is the diagram of the waveform of the GEN23 routine, as used in the example:</phrase>
+ </textobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen23.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 2 0 128 -23 "spectrum.txt" - not normalized</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 2 0 128 -23 "spectrum.txt" - not normalized</para>
+ </caption>
+ </mediaobject>
+
+ </para>
+ </refsect1>
<refsect1>
<title>Credits</title>
<para>
diff --git a/scoregens/gen24.xml b/scoregens/gen24.xml
index 421c10d..973e89f 100644
--- a/scoregens/gen24.xml
+++ b/scoregens/gen24.xml
@@ -47,6 +47,18 @@ real starting from zero.
</note>
</refsect1>
+ <refsect1>
+ <title>Examples</title>
+ <para>
+ Here is an example of the GEN24 opcode. It uses the file <ulink url="examples/gen24.csd"><citetitle>gen24.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the GEN24 opcode.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/gen24.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ </para>
+ </refsect1>
+
<refsect1>
<title>Credits</title>
<para>Author: &namegabriel;</para>
diff --git a/scoregens/gen25.xml b/scoregens/gen25.xml
index 25784c2..e2c5aaa 100644
--- a/scoregens/gen25.xml
+++ b/scoregens/gen25.xml
@@ -46,6 +46,36 @@
</note>
</refsect1>
+ <refsect1>
+ <title>Examples</title>
+ <para>
+ Here is an example of the GEN25 opcode. It uses the file <ulink url="examples/gen25.csd"><citetitle>gen25.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the GEN25 opcode.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/gen25.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ <textobject>
+ <phrase>This is the diagram of the waveform of the GEN25 routine, as used in the example:</phrase>
+ </textobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen25.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 2 0 1025 25 0 0.01 200 1 400 1 513 0.01 - a function which begins at 0.01, rises to 1 at the 200th table location, makes a straight line to the 400th location, and returns to 0.01 by the end of the table</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 2 0 1025 25 0 0.01 200 1 400 1 513 0.01 - a function which begins at 0.01, rises to 1 at the 200th table location, makes a straight line to the 400th location, and returns to 0.01 by the end of the table</para>
+ </caption>
+ </mediaobject>
+
+ </para>
+ </refsect1>
+
<refsect1>
<title>See Also</title>
<para>
diff --git a/scoregens/gen27.xml b/scoregens/gen27.xml
index 4b00dc5..13e18c2 100644
--- a/scoregens/gen27.xml
+++ b/scoregens/gen27.xml
@@ -46,14 +46,33 @@
</note>
</refsect1>
- <refsect1>
+ <refsect1>
<title>Examples</title>
<para>
- <informalexample>
- <programlisting><emphasis role="stamnt">f</emphasis> 1 0 257 27 0 0 100 1 200 -1 256 0</programlisting>
- </informalexample>
+ Here is an example of the GEN27 opcode. It uses the file <ulink url="examples/gen27.csd"><citetitle>gen27.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the GEN27 opcode.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/gen27.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ <textobject>
+ <phrase>This is the diagram of the waveform of the GEN27 routine, as used in the example:</phrase>
+ </textobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen27.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 2 0 1025 27 0 0 200 1 400 -1 513 0 - a function which begins at 0, rises to 1 at the 200th table location, falls to -1, by the 400th location, and returns to 0 by the end of the table. The interpolation is linear</phrase>
+ </textobject>
- This describes a function which begins at 0, rises to 1 at the 100th table location, falls to -1, by the 200th location, and returns to 0 by the end of the table. The interpolation is linear.
+ <caption>
+ <para>f 2 0 1025 27 0 0 200 1 400 -1 513 0 - a function which begins at 0, rises to 1 at the 200th table location, falls to -1, by the 400th location, and returns to 0 by the end of the table. The interpolation is linear</para>
+ </caption>
+ </mediaobject>
+
</para>
</refsect1>
diff --git a/scoregens/gen28.xml b/scoregens/gen28.xml
index c8b7eef..6d1f990 100644
--- a/scoregens/gen28.xml
+++ b/scoregens/gen28.xml
@@ -85,8 +85,16 @@ time3 X3 Y3
Since <emphasis>GEN28</emphasis> creates values to 10 milliseconds of resolution, there will be 500 values created by interpolating X1 to X2 to X3 and so on, and Y1 to Y2 to Y3 and so on, over the appropriate number of values that are stored in the function table. The sound will begin in the left front, over 1 second it will move to the right front, over another second it move further into the distance but still in the right front, then in just 1/10th of a second it moves to the left rear, a bit distant. Finally over the last .9 seconds the sound will move to the right rear, moderately distant, and it comes to rest between the two left channels (due west!), quite distant.
</para>
+ <para>
+ Here is an example of the GEN28 routine. It uses the file <ulink url="examples/gen28.csd"><citetitle>gen28.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the gen28 opcode.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/gen28.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ </para>
</refsect1>
-
+
<refsect1>
<title>Credits</title>
<para>
diff --git a/scoregens/gen30.xml b/scoregens/gen30.xml
index 0d86a47..e7a4ff9 100644
--- a/scoregens/gen30.xml
+++ b/scoregens/gen30.xml
@@ -54,6 +54,18 @@
The reason of this limitation is that <emphasis>GEN30</emphasis> uses FFT, which requires power of two table size. <link linkend="GEN32"><citetitle>GEN32</citetitle></link> allows using linear interpolation for resampling and phase shifting, which makes it possible to use any table size (however, for partials calculated with FFT, the power of two limitation still exists).
</para>
</refsect1>
+
+ <refsect1>
+ <title>Examples</title>
+ <para>
+ Here is an example of the GEN30 routine. It uses the files <ulink url="examples/gen30.csd"><citetitle>gen30.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the GEN30 routine.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/gen30.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ </para>
+ </refsect1>
<refsect1>
<title>Credits</title>
diff --git a/scoregens/gen32.xml b/scoregens/gen32.xml
index 644d4da..2f2afaf 100644
--- a/scoregens/gen32.xml
+++ b/scoregens/gen32.xml
@@ -42,63 +42,16 @@
<emphasis>phsa, phsb, ...</emphasis> -- start phase (0 to 1)
</para>
</refsect1>
-
+
<refsect1>
<title>Examples</title>
<para>
- <informalexample>
- <programlisting>
-itmp <emphasis role="opc">ftgen</emphasis> 1, 0, 16384, 7, 1, 16384, <emphasis role="op">-</emphasis>1 <emphasis role="comment">; sawtooth</emphasis>
-itmp <emphasis role="opc">ftgen</emphasis> 2, 0, 8192, 10, 1 <emphasis role="comment">; sine</emphasis>
-<emphasis role="comment">; mix tables</emphasis>
-itmp <emphasis role="opc">ftgen</emphasis> 5, 0, 4096, <emphasis role="op">-</emphasis>32, <emphasis role="op">-</emphasis>2, 1.5, 1.0, 0.25, 1, 2, 0.5, 0, \
- 1, 3, <emphasis role="op">-</emphasis>0.25, 0.5
-<emphasis role="comment">; window</emphasis>
-itmp <emphasis role="opc">ftgen</emphasis> 6, 0, 16384, 20, 3, 1
-<emphasis role="comment">; generate band-limited waveforms</emphasis>
-inote <emphasis role="op">=</emphasis> 0
-<emphasis role="olabel">loop0:</emphasis>
-icps <emphasis role="op">=</emphasis> 440 <emphasis role="op">*</emphasis> <emphasis role="opc">exp</emphasis>(<emphasis role="opc">log</emphasis>(2) <emphasis role="op">*</emphasis> (inote <emphasis role="op">-</emphasis> 69) <emphasis role="op">/</emphasis> 12) <emphasis role="comment">; one table for</emphasis>
-inumh <emphasis role="op">=</emphasis> <emphasis role="ohdr">sr</emphasis> <emphasis role="op">/</emphasis> (2 <emphasis role="op">*</emphasis> icps) <emphasis role="comment">; each MIDI note number</emphasis>
-ift <emphasis role="op">=</emphasis> <emphasis role="opc">int</emphasis>(inote <emphasis role="op">+</emphasis> 256.5)
-itmp <emphasis role="opc">ftgen</emphasis> ift, 0, 4096, <emphasis role="op">-</emphasis>30, 5, 1, inumh
-inote <emphasis role="op">=</emphasis> inote <emphasis role="op">+</emphasis> 1
- <emphasis role="octrl">if</emphasis> (inote <emphasis role="op">&lt;</emphasis> 127.5) <emphasis role="octrl">igoto</emphasis> <emphasis role="olabel">loop0</emphasis>
-
- <emphasis role="oblock">instr</emphasis> 1
-
-kcps <emphasis role="opc">expon</emphasis> 20, p3, 16000
-kft <emphasis role="op">=</emphasis> <emphasis role="opc">int</emphasis>(256.5 <emphasis role="op">+</emphasis> 69 <emphasis role="op">+</emphasis> 12 <emphasis role="op">*</emphasis> <emphasis role="opc">log</emphasis>(kcps <emphasis role="op">/</emphasis> 440) <emphasis role="op">/</emphasis> <emphasis role="opc">log</emphasis>(2))
-kft <emphasis role="op">=</emphasis> (kft <emphasis role="op">&gt;</emphasis> 383 <emphasis role="op">?</emphasis> 383 <emphasis role="op">:</emphasis> kft)
-
-a1 <emphasis role="opc">phasor</emphasis> kcps
-a1 <emphasis role="opc">tableikt</emphasis> a1, kft, 1, 0, 1
-
- <emphasis role="opc">out</emphasis> a1 <emphasis role="op">*</emphasis> 10000
-
- <emphasis role="oblock">endin</emphasis>
- <emphasis role="oblock">instr</emphasis> 2
-
-kcps <emphasis role="opc">expon</emphasis> 20, p3, 16000
-kft <emphasis role="op">=</emphasis> <emphasis role="opc">int</emphasis>(256.5 <emphasis role="op">+</emphasis> 69 <emphasis role="op">+</emphasis> 12 <emphasis role="op">*</emphasis> <emphasis role="opc">log</emphasis>(kcps <emphasis role="op">/</emphasis> 440) <emphasis role="op">/</emphasis> <emphasis role="opc">log</emphasis>(2))
-kft <emphasis role="op">=</emphasis> (kft <emphasis role="op">&gt;</emphasis> 383 <emphasis role="op">?</emphasis> 383 <emphasis role="op">:</emphasis> kft)
-
-kgdur <emphasis role="opc">limit</emphasis> 10 <emphasis role="op">/</emphasis> kcps, 0.1, 1
-a1 <emphasis role="opc">grain2</emphasis> kcps, 0.02, kgdur, 30, kft, 6, <emphasis role="op">-</emphasis>0.5
-
- <emphasis role="opc">out</emphasis> a1 <emphasis role="op">*</emphasis> 2000
-
- <emphasis role="oblock">endin</emphasis>
-
-----------
-score:
-----------
-
-<emphasis role="stamnt">t</emphasis> 0 60
-<emphasis role="stamnt">i</emphasis> 1 0 10
-<emphasis role="stamnt">i</emphasis> 2 12 10
-<emphasis role="stamnt">e</emphasis></programlisting>
- </informalexample>
+ Here is an example of the GEN32 routine. It uses the file <ulink url="examples/gen32.csd"><citetitle>gen32.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the gen32 opcode.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/gen32.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
</para>
</refsect1>
diff --git a/scoregens/gen33.xml b/scoregens/gen33.xml
index 361d8ec..adfd6e8 100644
--- a/scoregens/gen33.xml
+++ b/scoregens/gen33.xml
@@ -63,37 +63,34 @@ stra, pna, phsa, strb, pnb, phsb, ...
<emphasis>fmode</emphasis> (optional, default = 0) -- a non-zero value can be used to set frequency in Hz instead of partial numbers in the source table. The sample rate is assumed to be fmode if it is positive, or -(sr * fmode) if any negative value is specified.
</para>
</refsect1>
-
+
<refsect1>
<title>Examples</title>
<para>
- <informalexample>
- <programlisting>
-<emphasis role="comment">; partials 1, 4, 7, 10, 13, 16, etc. with base frequency of 400 Hz</emphasis>
-
-ibsfrq <emphasis role="op">=</emphasis> 400
-<emphasis role="comment">; estimate number of partials</emphasis>
-inumh <emphasis role="op">=</emphasis> <emphasis role="opc">int</emphasis>(1.5 <emphasis role="op">+</emphasis> <emphasis role="ohdr">sr</emphasis> <emphasis role="op">*</emphasis> 0.5 <emphasis role="op">/</emphasis> (3 <emphasis role="op">*</emphasis> ibsfrq))
-<emphasis role="comment">; source table length</emphasis>
-isrcln <emphasis role="op">=</emphasis> <emphasis role="opc">int</emphasis>(0.5 <emphasis role="op">+</emphasis> <emphasis role="opc">exp</emphasis>(<emphasis role="opc">log</emphasis>(2) <emphasis role="op">*</emphasis> <emphasis role="opc">int</emphasis>(1.01 <emphasis role="op">+</emphasis> <emphasis role="opc">log</emphasis>(inumh <emphasis role="op">*</emphasis> 3) <emphasis role="op">/</emphasis> <emphasis role="opc">log</emphasis>(2))))
-<emphasis role="comment">; create empty source table</emphasis>
-itmp <emphasis role="opc">ftgen</emphasis> 1, 0, isrcln, <emphasis role="op">-</emphasis>2, 0
-ifpos = 0
-ifrq = ibsfrq
-inumh = 0
-<emphasis role="olabel">l1</emphasis>:
- <emphasis role="opc">tableiw</emphasis> ibsfrq <emphasis role="op">/</emphasis> ifrq, ifpos, 1 <emphasis role="comment">; amplitude</emphasis>
- <emphasis role="opc">tableiw</emphasis> ifrq, ifpos <emphasis role="op">+</emphasis> 1, 1 <emphasis role="comment">; frequency</emphasis>
- <emphasis role="opc">tableiw</emphasis> 0, ifpos <emphasis role="op">+</emphasis> 2, 1 <emphasis role="comment">; phase</emphasis>
-ifpos <emphasis role="op">=</emphasis> ifpos <emphasis role="op">+</emphasis> 3
-ifrq <emphasis role="op">=</emphasis> ifrq <emphasis role="op">+</emphasis> ibsfrq <emphasis role="op">*</emphasis> 3
-inumh <emphasis role="op">=</emphasis> inumh <emphasis role="op">+</emphasis> 1
- <emphasis role="octrl">if</emphasis> (ifrq <emphasis role="op">&lt;</emphasis> (<emphasis role="ohdr">sr</emphasis> <emphasis role="op">*</emphasis> 0.5)) <emphasis role="op">igoto</emphasis> <emphasis role="olabel">l1</emphasis>
-
-<emphasis role="comment">; store output in ftable 2 (size = 262144)</emphasis>
-
-itmp <emphasis role="opc">ftgen</emphasis> 2, 0, 262144, <emphasis role="op">-</emphasis>33, 1, inumh, 1, <emphasis role="op">-</emphasis>1</programlisting>
- </informalexample>
+ Here is an example of the GEN33 routine. It uses the file <ulink url="examples/gen33.csd"><citetitle>gen33.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the gen33 opcode.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/gen33.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+
+ <textobject>
+ <phrase>This is the diagram of the waveform generated by GEN33, as used in the example:</phrase>
+ </textobject>
+ <para>
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen33.png" format="PNG"/>
+ <textobject>
+ <phrase>f 2 0 262144 -33 1 inumh 1 -1</phrase>
+ </textobject>
+ </imageobject>
+
+ <caption>
+ <para>f 2 0 262144 -33 1 inumh 1 -1</para>
+ </caption>
+ </mediaobject>
</para>
</refsect1>
diff --git a/scoregens/gen34.xml b/scoregens/gen34.xml
index 9b70a03..0a170b6 100644
--- a/scoregens/gen34.xml
+++ b/scoregens/gen34.xml
@@ -64,36 +64,35 @@ stra, pna, phsa, strb, pnb, phsb, ...
</para>
</refsect1>
+
<refsect1>
<title>Examples</title>
<para>
- <informalexample>
- <programlisting>
-<emphasis role="comment">; partials 1, 4, 7, 10, 13, 16, etc. with base frequency of 400 Hz</emphasis>
-
-ibsfrq <emphasis role="op">=</emphasis> 400
-<emphasis role="comment">; estimate number of partials</emphasis>
-inumh <emphasis role="op">=</emphasis> <emphasis role="opc">int</emphasis>(1.5 <emphasis role="op">+</emphasis> <emphasis role="ohdr">sr</emphasis> <emphasis role="op">*</emphasis> 0.5 <emphasis role="op">/</emphasis> (3 <emphasis role="op">*</emphasis> ibsfrq))
-<emphasis role="comment">; source table length</emphasis>
-isrcln <emphasis role="op">=</emphasis> <emphasis role="opc">int</emphasis>(0.5 <emphasis role="op">+</emphasis> <emphasis role="opc">exp</emphasis>(<emphasis role="opc">log</emphasis>(2) <emphasis role="op">*</emphasis> <emphasis role="opc">int</emphasis>(1.01 <emphasis role="op">+</emphasis> <emphasis role="opc">log</emphasis>(inumh <emphasis role="op">*</emphasis> 3) <emphasis role="op">/</emphasis> <emphasis role="opc">log</emphasis>(2))))
-<emphasis role="comment">; create empty source table</emphasis>
-itmp <emphasis role="opc">ftgen</emphasis> 1, 0, isrcln, <emphasis role="op">-</emphasis>2, 0
-ifpos = 0
-ifrq = ibsfrq
-inumh = 0
-<emphasis role="olabel">l1</emphasis>:
- <emphasis role="opc">tableiw</emphasis> ibsfrq <emphasis role="op">/</emphasis> ifrq, ifpos, 1 <emphasis role="comment">; amplitude</emphasis>
- <emphasis role="opc">tableiw</emphasis> ifrq, ifpos <emphasis role="op">+</emphasis> 1, 1 <emphasis role="comment">; frequency</emphasis>
- <emphasis role="opc">tableiw</emphasis> 0, ifpos <emphasis role="op">+</emphasis> 2, 1 <emphasis role="comment">; phase</emphasis>
-ifpos <emphasis role="op">=</emphasis> ifpos <emphasis role="op">+</emphasis> 3
-ifrq <emphasis role="op">=</emphasis> ifrq <emphasis role="op">+</emphasis> ibsfrq <emphasis role="op">*</emphasis> 3
-inumh <emphasis role="op">=</emphasis> inumh <emphasis role="op">+</emphasis> 1
- <emphasis role="octrl">if</emphasis> (ifrq <emphasis role="op">&lt;</emphasis> (<emphasis role="ohdr">sr</emphasis> <emphasis role="op">*</emphasis> 0.5)) <emphasis role="op">igoto</emphasis> <emphasis role="olabel">l1</emphasis>
-
-<emphasis role="comment">; store output in ftable 2 (size = 262144)</emphasis>
-
-itmp <emphasis role="opc">ftgen</emphasis> 2, 0, 262144, <emphasis role="op">-</emphasis>34, 1, inumh, 1, <emphasis role="op">-</emphasis>1</programlisting>
- </informalexample>
+ Here is an example of the GEN34 routine. It uses the file <ulink url="examples/gen34.csd"><citetitle>gen34.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the gen34 opcode.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/gen34.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+
+ <textobject>
+ <phrase>This is the diagram of the waveform generated by GEN34, as used in the example:</phrase>
+ </textobject>
+ <para>
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen34.png" format="PNG"/>
+ <textobject>
+ <phrase>f 2 0 262144 -34 1 inumh 1 -1</phrase>
+ </textobject>
+ </imageobject>
+
+ <caption>
+ <para>f 2 0 262144 -34 1 inumh 1 -1</para>
+ </caption>
+ </mediaobject>
+
</para>
</refsect1>
diff --git a/scoregens/gen40.xml b/scoregens/gen40.xml
index 82887b5..5a380bf 100644
--- a/scoregens/gen40.xml
+++ b/scoregens/gen40.xml
@@ -39,6 +39,66 @@
</para>
</refsect1>
+ <refsect1>
+ <title>Examples</title>
+ <para>
+ Here is an example of the GEN40 opcode. It uses the file <ulink url="examples/gen40.csd"><citetitle>gen40.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the GEN40 opcode.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/gen40.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ Its output should include lines like these:
+ <screen>
+ i 1 time 0.00067: 53.14918
+ i 1 time 0.20067: 0.00000
+ i 1 time 0.40067: 0.00000
+ i 1 time 0.60067: 96.80406
+ i 1 time 0.80067: 94.20729
+ i 1 time 1.00000: 0.00000
+ i 1 time 1.20067: 86.13032
+ i 1 time 1.40067: 31.37096
+ i 1 time 1.60067: 70.35889
+ i 1 time 1.80000: 0.00000
+ i 1 time 2.00000: 49.18914
+
+WARNING: Seeding from current time 2006647442
+
+ i 2 time 3.00067: 21.45002
+ i 2 time 3.20067: 44.32333
+ i 2 time 3.40067: 46.05420
+ i 2 time 3.60000: 0.00000
+ i 2 time 3.80067: 41.32175
+ i 2 time 4.00000: 0.00000
+ i 2 time 4.20000: 63.72019
+ i 2 time 4.40067: 0.00000
+ i 2 time 4.60067: 0.00000
+ i 2 time 4.80067: 0.00000
+ i 2 time 5.00000: 74.49330
+ </screen>
+
+ <textobject>
+ <phrase>This is the diagram of the waveform of the GEN40 routine, as used in the example:</phrase>
+ </textobject>
+ <para>
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen40.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 2 0 16384 40 1</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 2 0 16384 40 1</para>
+ </caption>
+ </mediaobject>
+
+ </para>
+ </refsect1>
+
<refsect1>
<title>Credits</title>
<para>Author: &namegabriel;</para>
diff --git a/scoregens/gen41.xml b/scoregens/gen41.xml
index 0975be3..c0f6b30 100644
--- a/scoregens/gen41.xml
+++ b/scoregens/gen41.xml
@@ -35,6 +35,50 @@
</para>
</refsect1>
+ <refsect1>
+ <title>Examples</title>
+ <para>
+ Here is an example of the GEN41 opcode. It uses the file <ulink url="examples/gen41.csd"><citetitle>gen41.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the GEN41 opcode.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/gen41.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ Its output should include lines like these:
+ <screen>
+i 1 time 0.00067: 8.00000
+i 1 time 0.00133: 8.00000
+i 1 time 0.00200: 8.00000
+i 1 time 0.00267: 8.00000
+i 1 time 0.00333: 2.00000
+i 1 time 0.00400: 8.00000
+i 1 time 0.00533: 8.00000
+i 1 time 0.00600: 8.00000
+..........
+ </screen>
+
+ <textobject>
+ <phrase>This is the diagram of the waveform of the GEN41 routine, as used in the example:</phrase>
+ </textobject>
+ <para>
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen41.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 1 0 -20 -41 2 .1 8 .9</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 1 0 -20 -41 2 .1 8 .9</para>
+ </caption>
+ </mediaobject>
+
+ </para>
+ </refsect1>
+
<refsect1>
<title>Credits</title>
<para>Author: &namegabriel;</para>
diff --git a/scoregens/gen42.xml b/scoregens/gen42.xml
index 87d546e..bd7f99a 100644
--- a/scoregens/gen42.xml
+++ b/scoregens/gen42.xml
@@ -35,6 +35,55 @@
</para>
</refsect1>
+ <refsect1>
+ <title>Examples</title>
+ <para>
+ Here is an example of the GEN42 opcode. It uses the file <ulink url="examples/gen42.csd"><citetitle>gen42.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the GEN42 opcode.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/gen42.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ Its output should include lines like these:
+ <screen>
+ i1 184.61538
+ i1 130.76923
+ i1 169.23077
+ i1 12.00000
+.......
+
+WARNING: Seeding from current time 3751086165
+
+ i2 138.46154
+ i2 12.00000
+ i2 123.07692
+ i2 161.53846
+ i2 123.07692
+ i2 153.84615
+......
+ </screen>
+
+ <textobject>
+ <phrase>This is the diagram of the waveform of the GEN42 routine, as used in the example:</phrase>
+ </textobject>
+ <para>
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen42.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase> f 1 0 -20 -42 10 20 .3 100 200 .7</phrase>
+ </textobject>
+
+ <caption>
+ <para> f 1 0 -20 -42 10 20 .3 100 200 .7</para>
+ </caption>
+ </mediaobject>
+ </para>
+ </refsect1>
+
<refsect1>
<title>Credits</title>
<para>Author: &namegabriel;</para>
diff --git a/scoregens/gen49.xml b/scoregens/gen49.xml
index 4ba6374..f1f8a43 100644
--- a/scoregens/gen49.xml
+++ b/scoregens/gen49.xml
@@ -91,16 +91,31 @@
<refsect1>
<title>Examples</title>
<para>
- Here is a simple example of the GEN49 routine. It uses the files <ulink url="examples/gen49.csd"><citetitle>gen49.csd</citetitle></ulink>, and <ulink url="examples/beats.mp3"><citetitle>beats.mp3</citetitle></ulink>. It uses the MP3 file <quote>beats.mp3</quote>.
-
+ Here is an example of the GEN49 routine. It uses the files <ulink url="examples/gen49.csd"><citetitle>gen49.csd</citetitle></ulink>.
<example>
- <title>A simple example of the GEN49 routine.</title>
-
+ <title>An example of the GEN49 routine.</title>
<xi:include href="examples-xml/gen49.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-
</example>
- </para>
+ <textobject>
+ <phrase>This is the diagram of the waveforms of the GEN49 routine, as used in the example:</phrase>
+ </textobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen49.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 1 0 131072 49 "beats.mp3" 0 1</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 1 0 131072 49 "beats.mp3" 0 1</para>
+ </caption>
+ </mediaobject>
+
+ </para>
</refsect1>
<refsect1>
diff --git a/scoregens/gen51.xml b/scoregens/gen51.xml
index 1c78420..c23a895 100644
--- a/scoregens/gen51.xml
+++ b/scoregens/gen51.xml
@@ -94,6 +94,63 @@
</refsect1>
<refsect1>
+ <title>Examples</title>
+ <para>
+ Here is an example of the GEN51 routine. It uses the files <ulink url="examples/gen51.csd"><citetitle>gen51.csd</citetitle></ulink>.
+ <example>
+ <title>An example of the GEN51 routine.</title>
+ <xi:include href="examples-xml/gen51.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+
+ <textobject>
+ <phrase>These are the diagrams of the waveforms of the GEN51 routines, as used in the example:</phrase>
+ </textobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen51_1.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 1 0 128 -51 12 2 cpsoct(8) 60 1 2^(1/12) 2^(2/12) 2^(3/12) 2^(4/12) 2^(5/12) 2^(6/12) 2^(7/12) 2^(8/12) 2^(9/12) 2^(10/12) 2^(11/12) 2^(12/12)</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 1 0 128 -51 12 2 cpsoct(8) 60 1 2^(1/12) 2^(2/12) 2^(3/12) 2^(4/12) 2^(5/12) 2^(6/12) 2^(7/12) 2^(8/12) 2^(9/12) 2^(10/12) 2^(11/12) 2^(12/12)</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen51_2.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 2 0 128 -51 10 2 cpsoct(8) 60 1 2^(1/10) 2^(2/10) 2^(3/10) 2^(4/10) 2^(5/10) 2^(6/10) 2^(7/10) 2^(8/10) 2^(9/10) 2^(10/10)</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 2 0 128 -51 10 2 cpsoct(8) 60 1 2^(1/10) 2^(2/10) 2^(3/10) 2^(4/10) 2^(5/10) 2^(6/10) 2^(7/10) 2^(8/10) 2^(9/10) 2^(10/10)</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen51_3.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 3 0 128 -51 24 2 cpsoct(8) 60 1 2^(1/24) 2^(2/24) 2^(3/24) 2^(4/24) 2^(5/24) 2^(6/24) 2^(7/24) 2^(8/24) 2^(9/24) 2^(10/24) 2^(11/24) 2^(12/24) 2^(13/24) 2^(14/24) 2^(15/24) 2^(16/24) 2^(17/24) 2^(18/24) 2^(19/24) 2^(20/24) 2^(21/24) 2^(22/24) 2^(23/24) 2^(24/24)</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 3 0 128 -51 24 2 cpsoct(8) 60 1 2^(1/24) 2^(2/24) 2^(3/24) 2^(4/24) 2^(5/24) 2^(6/24) 2^(7/24) 2^(8/24) 2^(9/24) 2^(10/24) 2^(11/24) 2^(12/24) 2^(13/24) 2^(14/24) 2^(15/24) 2^(16/24) 2^(17/24) 2^(18/24) 2^(19/24) 2^(20/24) 2^(21/24) 2^(22/24) 2^(23/24) 2^(24/24)</para>
+ </caption>
+ </mediaobject>
+
+ </para>
+ </refsect1>
+ <refsect1>
<title>Credits</title>
<para>Author: &namegabriel;</para>
</refsect1>
diff --git a/scoregens/gen52.xml b/scoregens/gen52.xml
index 644c4b4..584837a 100644
--- a/scoregens/gen52.xml
+++ b/scoregens/gen52.xml
@@ -40,8 +40,6 @@
<refsect1>
<title>Example</title>
-
-
<programlisting>
<emphasis role="comment">; source tables</emphasis>
<emphasis role="stamnt">f</emphasis> 1 0 16384 10 1
@@ -52,10 +50,33 @@
<emphasis role="stamnt">f</emphasis> 4 0 16384 -52 1 3 0 2
<emphasis role="comment">; extract second channel from table 3</emphasis>
<emphasis role="stamnt">f</emphasis> 5 0 16384 -52 1 3 1 2</programlisting>
+ <para>
+ Here is a complete example of the GEN52 opcode. It uses the file <ulink url="examples/gen52.csd"><citetitle>gen52.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the GEN52 opcode.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/gen52.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ <textobject>
+ <phrase>This is the diagram of the waveform of the GEN52 routine, as used in the example:</phrase>
+ </textobject>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gen52.png" format="PNG"/>
+ </imageobject>
- </refsect1>
+ <textobject>
+ <phrase>f 3 0 262144 -52 3 2 0 4 2 1 4 2 2 4</phrase>
+ </textobject>
+ <caption>
+ <para>f 3 0 262144 -52 3 2 0 4 2 1 4 2 2 4</para>
+ </caption>
+ </mediaobject>
+
+ </para>
+ </refsect1>
<refsect1>
<title>Credits</title>
<para>Author: &nameistvan;</para>
diff --git a/scoregens/genexp.xml b/scoregens/genexp.xml
index e472e3f..23d2dea 100644
--- a/scoregens/genexp.xml
+++ b/scoregens/genexp.xml
@@ -15,7 +15,7 @@
<refsect1>
<title>Description</title>
<para>
-Creates an ftable with values of the exp function ....
+Creates an ftable with values of the exp function.
</para>
</refsect1>
<refsect1>
@@ -32,7 +32,7 @@ Creates an ftable with values of the exp function ....
</para>
<para>
- <emphasis>start, end</emphasis> -- first and last value to be stored. The points stored are uniformly spaced between these to the table size
+ <emphasis>start, end</emphasis> -- first and last value to be stored; the GEN draws a curve that goes from start to end: exp(start) .... exp(end). The points stored are uniformly spaced between these to the table size
</para>
<para>
<emphasis>rescale</emphasis> -- if not zero the table is not rescaled
@@ -43,18 +43,45 @@ Creates an ftable with values of the exp function ....
<refsect1>
<title>Examples</title>
<para>
- Here is a simple example of the <emphasis>GENexp</emphasis> routine. It uses the
- file <ulink
- url="examples/genexp.csd"><citetitle>genexp.csd</citetitle></ulink>.
- It will generate a simple exp shaped output wave.
+ Here is a simple example of the GENexp routine. It uses the file <ulink url="examples/genexp.csd"><citetitle>genexp.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the GENexp routine.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/genexp.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ <textobject>
+ <phrase>These are the diagrams of the waveforms of the GENexp routines, as used in the example:</phrase>
+ </textobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/genexp_1.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase> f 2 0 8192 "exp" 0 15 0</phrase>
+ </textobject>
+
+
+ <caption>
+ <para> f 2 0 8192 "exp" 0 15 0</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/genexp_2.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase> f 3 0 8192 "exp" 0 3 0</phrase>
+ </textobject>
+
+ <caption>
+ <para> f 3 0 8192 "exp" 0 3 0</para>
+ </caption>
+ </mediaobject>
- <example>
- <title>A simple example of the GENexp routine.</title>
- <para>
- See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.
- </para>
- <xi:include href="examples-xml/genexp.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- </example>
</para>
</refsect1>
@@ -64,6 +91,7 @@ Creates an ftable with values of the exp function ....
<link linkend="GENexp"><citetitle>GENexp</citetitle></link> and
<link linkend="GENsone"><citetitle>GENsone</citetitle></link>.
</para>
+ <para> More information on this routine: <ulink url="http://www.csounds.com/journal/issue11/distortionSynthesis.html"><citetitle>http://www.csounds.com/journal/issue11/distortionSynthesis</citetitle></ulink>, written by Victor Lazzarini</para>
</refsect1>
<refsect1>
diff --git a/scoregens/genfarey.xml b/scoregens/genfarey.xml
index 78166ce..644ff1a 100644
--- a/scoregens/genfarey.xml
+++ b/scoregens/genfarey.xml
@@ -182,6 +182,7 @@
</itemizedlist>
</para>
</refsect1>
+
<refsect1>
<title>Examples</title>
<para>
@@ -221,6 +222,48 @@ same as mode 0, but this time '1' is added to each table element.
<xi:include href="examples-xml/genfarey.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</example>
</para>
+
+ <para>
+ Here is a complete example of the GENfarey routine. It uses the files <ulink url="examples/genfarey-2.csd"><citetitle>genfarey-2.csd</citetitle></ulink>.
+ <example>
+ <title>Another example of the GENfarey routine.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/genfarey-2.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+
+ <textobject>
+ <phrase>These are the diagrams of the waveforms of the GENfarey routines, as used in the example:</phrase>
+ </textobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/genfarey-2_1.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>gidelta ftgen 100,0,-18,"farey",7,1 - delta values of Farey Sequence 7</phrase>
+ </textobject>
+
+ <caption>
+ <para>gidelta ftgen 100,0,-18,"farey",7,1 - delta values of Farey Sequence 7</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/genfarey-2_2.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>gimult ftgen 101,0,-18,"farey",7,2 - generate the denominators of fractions of F_7 </phrase>
+ </textobject>
+
+ <caption>
+ <para>gimult ftgen 101,0,-18,"farey",7,2 - generate the denominators of fractions of F_7 </para>
+ </caption>
+ </mediaobject>
+
+ </para>
</refsect1>
<refsect1>
diff --git a/scoregens/gensone.xml b/scoregens/gensone.xml
index 1279d9c..6be66aa 100644
--- a/scoregens/gensone.xml
+++ b/scoregens/gensone.xml
@@ -47,31 +47,40 @@
is the Sone loudness curve.
</para>
</refsect1>
-
+
<refsect1>
<title>Examples</title>
<para>
- Here is a simple example of the <emphasis>GENsone</emphasis> routine. It uses the
- file <ulink
- url="examples/gensone.csd"><citetitle>gensone.csd</citetitle></ulink>.
- It will generate a simple sone shaped output wave.
-
+ Here is an example of the GENsone routine. It uses the files <ulink url="examples/gensone.csd"><citetitle>gensone.csd</citetitle></ulink>.
<example>
- <title>A simple example of the GENsone routine.</title>
- <para>
- See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.
- </para>
+ <title>An example of the GENsone routine.</title>
<xi:include href="examples-xml/gensone.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</example>
+
+ <textobject>
+ <phrase>This is the diagram of the waveforms of the GENsone routine, as used in the example:</phrase>
+ </textobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gensone.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>f 2 0 16385 "sone" 0 32000 32000 0</phrase>
+ </textobject>
+
+ <caption>
+ <para>f 2 0 16385 "sone" 0 32000 32000 0</para>
+ </caption>
+ </mediaobject>
+
</para>
</refsect1>
-
+
<refsect1>
- <title>See Also</title>
- <para>
- <link linkend="GENexp"><citetitle>GENexp</citetitle></link> and
- <link linkend="GENtanh"><citetitle>GENtanh</citetitle></link>.
- </para>
+ <title>See Also</title>
+ <para> More information on Sone: <ulink url="http://en.wikipedia.org/wiki/Sone"><citetitle>http://en.wikipedia.org/wiki/Sone</citetitle></ulink></para>
</refsect1>
<refsect1>
diff --git a/scoregens/gentanh.xml b/scoregens/gentanh.xml
index e6004a0..b91f407 100644
--- a/scoregens/gentanh.xml
+++ b/scoregens/gentanh.xml
@@ -15,7 +15,7 @@
<refsect1>
<title>Description</title>
<para>
- Creates an ftable with values of the tanh function ....
+ Creates an ftable with values of the tanh function.
</para>
</refsect1>
<refsect1>
@@ -32,7 +32,7 @@
</para>
<para>
- <emphasis>start, end</emphasis> -- first and last value to be stored. The points stored are uniformly spaced between these to the table size
+ <emphasis>start, end</emphasis> -- first and last value to be stored; the GEN draws a curve that goes from start to end: tanh(start) .... tanh(end). The points stored are uniformly spaced between these to the table size
</para>
<para>
<emphasis>rescale</emphasis> -- if not zero the table is not rescaled
@@ -43,18 +43,58 @@
<refsect1>
<title>Examples</title>
<para>
- Here is a simple example of the GENtanh routine. It uses the
- file <ulink
- url="examples/gentanh.csd"><citetitle>gentanh.csd</citetitle></ulink>.
- It will generate a simple tanh shaped output wave.
-
- <example>
- <title>A simple example of the GENtanh routine.</title>
- <para>
- See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.
- </para>
- <xi:include href="examples-xml/gentanh.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- </example>
+ Here is a simple example of the GENtanh routine. It uses the file <ulink url="examples/gentanh.csd"><citetitle>gentanh.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the GENtanh routine.</title>
+ <para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
+ <xi:include href="examples-xml/gentanh.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ <textobject>
+ <phrase>These are the diagrams of the waveforms of the GENtanh routines, as used in the example:</phrase>
+ </textobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gentanh_1.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase> f 2 0 8192 "tanh" -100 100 0 - lots of distortion</phrase>
+ </textobject>
+
+
+ <caption>
+ <para> f 2 0 8192 "tanh" -100 100 0 - lots of distortion</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gentanh_2.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase> f 3 0 8192 "tanh" -10 10 0 - less distortion than f2 </phrase>
+ </textobject>
+
+ <caption>
+ <para> f 3 0 8192 "tanh" -10 10 0 - less distortion than f2</para>
+ </caption>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/gentanh_3.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase> f 4 0 8192 "tanh" -10 15 0</phrase>
+ </textobject>
+
+ <caption>
+ <para> f 4 0 8192 "tanh" -10 15 0</para>
+ </caption>
+ </mediaobject>
</para>
</refsect1>
@@ -63,6 +103,7 @@
<para>
<link linkend="GENexp"><citetitle>GENexp</citetitle></link> and
<link linkend="GENsone"><citetitle>GENsone</citetitle></link>.
+ <para> More information on this routine: <ulink url="http://www.csounds.com/journal/issue11/distortionSynthesis.html"><citetitle>http://www.csounds.com/journal/issue11/distortionSynthesis</citetitle></ulink>, written by Victor Lazzarini</para>
</para>
</refsect1>
diff --git a/scoregens/genwave.xml b/scoregens/genwave.xml
new file mode 100644
index 0000000..100ea27
--- /dev/null
+++ b/scoregens/genwave.xml
@@ -0,0 +1,107 @@
+<refentry id="GENwave">
+ <indexterm id="IndexGENwave"><primary>GENwave</primary></indexterm>
+ <refmeta>
+ <refentrytitle>GENwave</refentrytitle>
+ </refmeta>
+
+ <refnamediv>
+ <refname>"wave"</refname>
+ <refpurpose>
+ Generates a compactly supported wavelet function.
+ </refpurpose>
+ </refnamediv>
+
+ <refsect1>
+ <title>Description</title>
+ <para>
+ Creates a compactly supported wavelet, scaling function or wavelet
+ packet. The output function is obtained by deconvolution of
+ corresponding mirror filter impulse response. This procedure is
+ applied in an iterative fashion.
+ </para>
+ <para>
+ The filter bank used in classic discrete wavelet transform grows
+ only towards low frequencies. Meanwhile wavelet packet transform
+ introduces any possible direction of tree's growth. The sequence
+ of mirror filters used in deconvolution is determined by binary
+ form of seq value. "0" corresponds to low-pass filter and "1" to
+ high-pass.
+ </para>
+ <para>
+ The number of iteration steps is determined by filter's length
+ and size of function table. I.e. for filter length 8 and table
+ size 256 there are log2(256/8) = 5 iterations available.
+ </para>
+ </refsect1>
+ <refsect1>
+ <title>Syntax</title>
+ <synopsis><command>f</command> # time size "wave" fnsf seq rescale</synopsis>
+ </refsect1>
+
+ <refsect1>
+ <title>Initialization</title>
+ <para>
+ <emphasis>size</emphasis> -- number of points in the table. Must
+ be a power of 2 or power-of-2 plus 1 (see <link
+ linkend="f"><citetitle>f statement</citetitle></link>).
+ </para>
+
+ <para>
+ <emphasis>fnsf</emphasis> -- pre-existing table with scaling
+ function coefficients.
+ </para>
+ <para>
+ <emphasis>seq</emphasis> -- non-negative integer number which
+ corresponds to sequence of low-pass and high-pass mirror filters
+ during deconvolution procedure.
+ </para>
+ <para>
+ <emphasis>rescale</emphasis> -- if not zero the table is not rescaled
+ </para>
+
+ </refsect1>
+
+ <refsect1>
+ <title>Examples</title>
+ <para>
+ Here is an example of the GENwave routine. It uses the file
+ <ulink
+ url="examples/genwave.csd"><citetitle>genwave.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the GENwave routine.</title>
+ <para>
+ See the sections <link
+ linkend="UsingRealTime"><citetitle>Real-time
+ Audio</citetitle></link> and <link
+ linkend="CommandFlags"><citetitle>Command Line
+ Flags</citetitle></link> for more information on using
+ command line flags.
+ </para>
+ <xi:include href="examples-xml/genwave.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title>See Also</title>
+ <para>
+ Ingrid Daubechies. Ten Lectures on Wavelets, SIAM 1992.
+ </para>
+ <para>
+ Pedro A.G. Batista. An Introduction to Sound Synthesis with
+ Wavelet Packets, Csound Book CD Chapters, MIT 2000.
+ </para>
+ <para>
+ Victor M. Wickerhauser. Acoustic Signal Compression with Wavelet
+ Packets, Yale 1992.
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title>Credits</title>
+ <para>Written by Gleb Rogozinsky</para>
+ <para>Saint-Petersburg University of Film and Television</para>
+ <para>Saint-Petersburg, Russia</para>
+ <para>April 2012</para>
+ </refsect1>
+</refentry>
diff --git a/scoregens/i.xml b/scoregens/i.xml
index e8d7a0a..52ff501 100644
--- a/scoregens/i.xml
+++ b/scoregens/i.xml
@@ -151,71 +151,15 @@
</para>
</refsect2>
</refsect1>
-
+
<refsect1>
<title>Examples</title>
<para>
- Here is an instrument which can find out whether it is tied to a previous note (<emphasis>tival</emphasis> returns 1), and whether it is held (negative p3). Attack and release are handled accordingly:
- <informalexample>
- <programlisting>
-<emphasis role="oblock">instr</emphasis> 10
-
- icps <emphasis role="opc">init</emphasis> <emphasis role="opc">cpspch</emphasis>(p4) <emphasis role="comment">; Get target pitch from score event</emphasis>
- iportime <emphasis role="opc">init</emphasis> <emphasis role="opc">abs</emphasis>(p3)<emphasis role="op">/</emphasis>7 <emphasis role="comment">; Portamento time dep on note length</emphasis>
- iamp0 <emphasis role="opc">init</emphasis> p5 <emphasis role="comment">; Set default amps</emphasis>
- iamp1 <emphasis role="opc">init</emphasis> p5
- iamp2 <emphasis role="opc">init</emphasis> p5
-
- itie <emphasis role="opc">tival</emphasis> <emphasis role="comment">; Check if this note is tied,</emphasis>
- <emphasis role="octrl">if</emphasis> itie <emphasis role="op">==</emphasis> 1 <emphasis role="octrl">igoto</emphasis> <emphasis role="olabel">nofadein</emphasis> <emphasis role="comment">; if not fade in</emphasis>
- iamp0 <emphasis role="opc">init</emphasis> 0
-
-<emphasis role="olabel">nofadein</emphasis>:
- <emphasis role="octrl">if</emphasis> p3 <emphasis role="op">&lt;</emphasis> 0 <emphasis role="octrl">igoto</emphasis> <emphasis role="olabel">nofadeout</emphasis> <emphasis role="comment">; Check if this note is held, if not fade out</emphasis>
- iamp2 <emphasis role="opc">init</emphasis> 0
-
-<emphasis role="olabel">nofadeout</emphasis>:
- <emphasis role="comment">; Now do amp from the set values:</emphasis>
- kamp <emphasis role="opc">linseg</emphasis> iamp0, .03, iamp1, <emphasis role="opc">abs</emphasis>(p3)<emphasis role="op">-</emphasis>.03, iamp2
-
- <emphasis role="comment">; Skip rest of initialization on tied note:</emphasis>
- <emphasis role="octrl">tigoto</emphasis> <emphasis role="olabel">tieskip</emphasis>
-
- kcps <emphasis role="opc">init</emphasis> icps <emphasis role="comment">; Init pitch for untied note</emphasis>
- kcps <emphasis role="opc">port</emphasis> icps, iportime, icps <emphasis role="comment">; Drift towards target pitch</emphasis>
-
- kpw <emphasis role="opc">oscil</emphasis> .4, <emphasis role="opc">rnd</emphasis>(1), 1, <emphasis role="opc">rnd</emphasis>(.7) <emphasis role="comment">; A simple triangle-saw oscil</emphasis>
- ar <emphasis role="opc">vco</emphasis> kamp, kcps, 3, kpw<emphasis role="op">+</emphasis>.5, 1, 1<emphasis role="op">/</emphasis>icps
-
- <emphasis role="comment">; (Used in testing - one may set ipch to cpspch(p4+2)
- ; and view output spectrum)
- ; ar oscil kamp, kcps, 1</emphasis>
-
- <emphasis role="opc">out</emphasis> ar
-
-<emphasis role="olabel">tieskip:</emphasis> <emphasis role="comment">; Skip some initialization on tied note</emphasis>
-
-<emphasis role="oblock">endin</emphasis></programlisting>
- </informalexample>
- </para>
-
- <para>
- A simple score using three instances of the above instrument:
- <informalexample>
- <programlisting>
- <emphasis role="stamnt">f</emphasis>1 0 8192 10 1 <emphasis role="comment">; Sine</emphasis>
-
- <emphasis role="stamnt">i</emphasis>10.1 0 -1 7.00 10000
- <emphasis role="stamnt">i</emphasis>10.2 0 -1 7.04
- <emphasis role="stamnt">i</emphasis>10.3 0 -1 7.07
- <emphasis role="stamnt">i</emphasis>10.1 1 -1 8.00
- <emphasis role="stamnt">i</emphasis>10.2 1 -1 8.04
- <emphasis role="stamnt">i</emphasis>10.3 1 -1 8.07
- <emphasis role="stamnt">i</emphasis>10.1 2 1 7.11
- <emphasis role="stamnt">i</emphasis>10.2 2 1 8.04
- <emphasis role="stamnt">i</emphasis>10.3 2 1 8.07
- <emphasis role="stamnt">e</emphasis></programlisting>
- </informalexample>
+ Here is an example of the i statement. It uses the file <ulink url="examples/i_statement.csd"><citetitle>i_statement.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the i statement.</title>
+ <xi:include href="examples-xml/i_statement.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
</para>
</refsect1>
diff --git a/scoregens/m.xml b/scoregens/m.xml
index ca86251..7b764e4 100644
--- a/scoregens/m.xml
+++ b/scoregens/m.xml
@@ -72,6 +72,17 @@
</refsect1>
<refsect1>
+ <title>Examples</title>
+ <para>
+ Here is an example of the m statement. It uses the file <ulink url="examples/m.csd"><citetitle>m.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the m statement.</title>
+ <xi:include href="examples-xml/m.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ </para>
+ </refsect1>
+
+ <refsect1>
<title>Credits</title>
<para>
<simplelist>
diff --git a/scoregens/n.xml b/scoregens/n.xml
index 250accf..e931792 100644
--- a/scoregens/n.xml
+++ b/scoregens/n.xml
@@ -71,6 +71,13 @@
</refsect1>
<refsect1>
+ <title>Examples</title>
+ <para>
+ See the example for the <link linkend="m"><citetitle>m statement</citetitle></link>.
+ </para>
+ </refsect1>
+
+ <refsect1>
<title>Credits</title>
<para>
<simplelist>
diff --git a/scoregens/q.xml b/scoregens/q.xml
index cbc48d7..43496b2 100644
--- a/scoregens/q.xml
+++ b/scoregens/q.xml
@@ -42,4 +42,16 @@
Note that this does not affect instruments that are already running at time <emphasis>p2</emphasis>. It blocks any attempt to start one afterwards.
</para>
</refsect1>
+
+ <refsect1>
+ <title>Examples</title>
+ <para>
+ Here is an example of the q statement. It uses the file <ulink url="examples/q.csd"><citetitle>q.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the q statement.</title>
+ <xi:include href="examples-xml/q.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ </para>
+ </refsect1>
+
</refentry>
diff --git a/scoregens/r.xml b/scoregens/r.xml
index 8828e5e..ca3fc38 100644
--- a/scoregens/r.xml
+++ b/scoregens/r.xml
@@ -53,7 +53,7 @@
<refsect1>
<title>Examples</title>
<para>
- Here is an example of the r statement. It uses the file <ulink url="examples/r.csd"><citetitle>r.sco</citetitle></ulink>.
+ Here is an example of the r statement. It uses the file <ulink url="examples/r.csd"><citetitle>r.csd</citetitle></ulink>.
<example>
<title>Example of the r statement.</title>
diff --git a/scoregens/s.xml b/scoregens/s.xml
index 1368163..37f9b1e 100644
--- a/scoregens/s.xml
+++ b/scoregens/s.xml
@@ -72,4 +72,16 @@
</para>
</note>
</refsect1>
+
+ <refsect1>
+ <title>Examples</title>
+ <para>
+ Here is an example of the s statement. It uses the file <ulink url="examples/s.csd"><citetitle>s.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the s statement.</title>
+ <xi:include href="examples-xml/s.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ </para>
+ </refsect1>
+
</refentry>
diff --git a/scoregens/t.xml b/scoregens/t.xml
index 5ea21db..4adab3f 100644
--- a/scoregens/t.xml
+++ b/scoregens/t.xml
@@ -70,5 +70,17 @@
N.B. If the CSound command includes a <link linkend="FlagsMinusLowerT"><citetitle>-t flag</citetitle></link>, the interpreted tempo of all score <emphasis>t statements</emphasis> will be overridden by the command-line tempo.
</para>
</refsect1>
+
+ <refsect1>
+ <title>Examples</title>
+ <para>
+ Here is an example of the t statement. It uses the file <ulink url="examples/t.csd"><citetitle>t.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the t statement.</title>
+ <xi:include href="examples-xml/t.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ </para>
+ </refsect1>
+
</refentry>
diff --git a/scoregens/top.xml b/scoregens/top.xml
index 489e3c7..313dd3b 100644
--- a/scoregens/top.xml
+++ b/scoregens/top.xml
@@ -269,6 +269,10 @@
<listitem>
<simpara><link linkend="GENfarey"><citetitle>"farey"</citetitle></link> - fills a table from a Farey sequence.</simpara>
</listitem>
+ <listitem>
+ <simpara><link linkend="GENwave"><citetitle>"wave"</citetitle></link>
+ - fills a table from a wavelet transform.</simpara>
+ </listitem>
</itemizedlist>
</section>
&scoregensgen01;
@@ -292,7 +296,6 @@
&scoregensgen19;
&scoregensgen20;
&scoregensgen21;
- &scoregensgen22;
&scoregensgen23;
&scoregensgen24;
&scoregensgen25;
@@ -314,4 +317,5 @@
&scoregensexp;
&scoregenssone;
&scoregensfarey;
+ &scoregenswave;
</chapter>
diff --git a/scoregens/v.xml b/scoregens/v.xml
index b70c3dc..7683bee 100644
--- a/scoregens/v.xml
+++ b/scoregens/v.xml
@@ -66,24 +66,6 @@
<para>
<informalexample>
<programlisting>
-<emphasis role="stamnt">i</emphasis>1 0 1 <emphasis role="comment">; note1</emphasis>
-<emphasis role="stamnt">v</emphasis>2
-<emphasis role="stamnt">i</emphasis>1 1 . <emphasis role="comment">; note2</emphasis>
-<emphasis role="stamnt">i</emphasis>1 2 . <emphasis role="comment">; note3</emphasis>
-<emphasis role="stamnt">v</emphasis>1
-<emphasis role="stamnt">i</emphasis>1 3 . <emphasis role="comment">; note4</emphasis>
-<emphasis role="stamnt">i</emphasis>1 4 . <emphasis role="comment">; note5</emphasis>
-<emphasis role="stamnt">e</emphasis></programlisting>
- </informalexample>
- </para>
-
- <para>
- In this example, note3 and note5 occur simultaneously, while note4 actually occurs before note3, that is, at its original place. Durations are unaffected.
- </para>
-
- <para>
- <informalexample>
- <programlisting>
<emphasis role="stamnt">i</emphasis>1 0 1
<emphasis role="stamnt">v</emphasis>2
<emphasis role="stamnt">i</emphasis>. + .
@@ -93,4 +75,17 @@
In this example, the <emphasis>v statement</emphasis> has no effect.
</para>
</refsect1>
+
+ <refsect1>
+ <title>Examples</title>
+ <para>
+ Here is an example of the v statement. It uses the file <ulink url="examples/v.csd"><citetitle>v.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the v statement.</title>
+ <xi:include href="examples-xml/v.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ In this example, note3 and note5 occur simultaneously, while note4 actually occurs before note3, that is, at its original place. Durations are unaffected.
+ </para>
+ </refsect1>
+
</refentry>
diff --git a/scoregens/x.xml b/scoregens/x.xml
index 790b06c..bb88b04 100644
--- a/scoregens/x.xml
+++ b/scoregens/x.xml
@@ -30,4 +30,16 @@
All pfields are ignored.
</para>
</refsect1>
+
+ <refsect1>
+ <title>Examples</title>
+ <para>
+ Here is an example of the x statement. It uses the file <ulink url="examples/x.csd"><citetitle>x.csd</citetitle></ulink>.
+ <example>
+ <title>Example of the x statement.</title>
+ <xi:include href="examples-xml/x.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </example>
+ </para>
+ </refsect1>
+
</refentry>