Imported Upstream version 5.10

2 files changed, 36 insertions, 27 deletions

diff --git a/scoregens/gen20.xml b/scoregens/gen20.xml
index 2ecc80e..7745f73 100644
--- a/scoregens/gen20.xml
+++ b/scoregens/gen20.xml
@@ -4,26 +4,26 @@
   <refmeta>
     <refentrytitle>GEN20</refentrytitle>
   </refmeta>
- 
+
   <refnamediv>
     <refname>GEN20</refname>
     <refpurpose>
       Generates functions of different windows.
     </refpurpose>
   </refnamediv>
- 
+
   <refsect1>
     <title>Description</title>
     <para>
       This subroutine generates functions of different windows. These windows are usually used for spectrum analysis or for grain envelopes.
     </para>
   </refsect1>
- 
+
   <refsect1>
     <title>Syntax</title>
     <synopsis><command>f</command> # time size 20 window max [opt]</synopsis>
   </refsect1>
- 
+
   <refsect1>
     <title>Initialization</title>
     <para>
@@ -38,38 +38,42 @@
           <para>1 = Hamming</para>
         </listitem>
         <listitem>
-	  <para>2 = Hanning</para>
+          <para>2 = Hanning</para>
         </listitem>
         <listitem>
-	  <para>3 = Bartlett ( triangle)</para>
+          <para>3 = Bartlett ( triangle)</para>
         </listitem>
         <listitem>
-	  <para>4 = Blackman ( 3-term)</para>
+          <para>4 = Blackman ( 3-term)</para>
         </listitem>
         <listitem>
-	  <para>5 = Blackman - Harris ( 4-term)</para>
+          <para>5 = Blackman - Harris ( 4-term)</para>
         </listitem>
         <listitem>
-	  <para>6 = Gaussian</para>
+          <para>6 = Gaussian</para>
         </listitem>
         <listitem>
-	  <para>7 = Kaiser</para>
+          <para>7 = Kaiser</para>
         </listitem>
         <listitem>
-	  <para>8 = Rectangle</para>
+          <para>8 = Rectangle</para>
         </listitem>
         <listitem>
-	  <para>9 = Sync</para>
+          <para>9 = Sync</para>
         </listitem>
       </itemizedlist>
     </para>
 
     <para>
-      <emphasis>max</emphasis> -- For negative p4 this will be the absolute value at window peak point. If p4 is positive or p4 is negative and p6 is missing the table will be post-rescaled to a maximum value of 1.
+      <emphasis>max</emphasis> -- For negative p4 this will be the absolute 
+      value at window peak point. If p4 is positive or p4 is negative
+      and p6 is missing the table will be post-rescaled to a maximum
+      value of 1. 
     </para>
 
     <para>
-      <emphasis>opt</emphasis> -- Optional argument required by the Kaiser window.
+      <emphasis>opt</emphasis> -- Optional argument required by the 
+      Gaussian window and the Kaiser window.
     </para>
   </refsect1>
  
@@ -112,6 +116,17 @@
     </para>
 
     <para>
+      <informalexample>
+        <programlisting>
+<emphasis role="stamnt">f</emphasis>       1       0       1024    20      6       1       2</programlisting>
+      </informalexample>
+
+      This creates a function that contains a Gaussian window with a
+      maximum value of 1.  The extra argument specifies how broad the
+      window is, as the standard deviation of the curve; in this
+      example the s.d. is 2.  The default value is 1.
+    </para>
+    <para>
       For diagrams, see <link linkend="MiscWindows"><citetitle>Window Functions</citetitle></link>
     </para>
   </refsect1>
@@ -135,5 +150,6 @@
     </para>
 
     <para>New in Csound version 3.2</para>
+    <para>Optional argument to Gaussian added in 5.10</para>
   </refsect1>
 </refentry>
diff --git a/scoregens/leftbrace.xml b/scoregens/leftbrace.xml
index 1ee8443..05523b3 100644
--- a/scoregens/leftbrace.xml
+++ b/scoregens/leftbrace.xml
@@ -4,26 +4,26 @@
   <refmeta>
     <refentrytitle>{ Statement</refentrytitle>
   </refmeta>
- 
+
   <refnamediv>
     <refname>{</refname>
     <refpurpose>
       Begins a non-sectional, nestable loop.
     </refpurpose>
   </refnamediv>
- 
+
   <refsect1>
     <title>Description</title>
     <para>
       The <emphasis>{</emphasis> and <emphasis>} statements</emphasis> can be used to repeat a group of score statements.  These loops do not constitute independent score sections and thus may repeat events within the same section.  Multiple loops may overlap in time or be nested within each other.
     </para>
   </refsect1>
- 
+
   <refsect1>
     <title>Syntax</title>
     <synopsis><command>{</command> p1 p2</synopsis>
   </refsect1>
- 
+
   <refsect1>
     <title>Initialization</title>
     <para>
@@ -34,7 +34,7 @@
       <emphasis>p2</emphasis> -- A macro name that is automatically defined at the beginning of the loop and whose value is advanced with each repetition (optional).  The initial value is zero and the final value is (p1 - 1).
     </para>
   </refsect1>
- 
+
   <refsect1>
     <title>Performance</title>
     <para>
@@ -73,9 +73,7 @@
 
 <emphasis role="stamnt">}</emphasis>
         </programlisting>
-
       is interpreted as 
-      
         <programlisting>
 <emphasis role="stamnt">i</emphasis>1  0.00   0.2   220
 <emphasis role="stamnt">i</emphasis>1  0.25   .     440
@@ -93,14 +91,12 @@
 <emphasis role="stamnt">i</emphasis>1  2.50   .     440
 <emphasis role="stamnt">i</emphasis>1  2.75   .     880
         </programlisting>
-      
       </example>
     </para>
 
     <para>
       <example>
         <title>Create a group of simultaneous harmonic partials.</title>
-        
         In this example, <emphasis>p4</emphasis> is assumed to be the frequency of the note event.
 
         <programlisting>
@@ -108,9 +104,7 @@
 <emphasis role="stamnt">i</emphasis>1  0  1   [100 * ($PARTIAL. + 1)]
 <emphasis role="stamnt">}</emphasis>
         </programlisting>
-
       is interpreted as 
-      
         <programlisting>
 <emphasis role="stamnt">i</emphasis>1  0  1   100
 <emphasis role="stamnt">i</emphasis>1  0  1   200
@@ -121,7 +115,6 @@
 <emphasis role="stamnt">i</emphasis>1  0  1   700
 <emphasis role="stamnt">i</emphasis>1  0  1   800
         </programlisting>
-      
       </example>
     </para>
 
@@ -136,7 +129,7 @@
     </para>
 
   </refsect1>
- 
+
   <refsect1>
     <title>Credits</title>
     <para>