update markup in panner chapter.

diff --git a/_manual/01_welcome-to-ardour.html b/_manual/01_welcome-to-ardour.html
index 0f30a3e902536a692fa82c65cebd4cff60adf245..80eb9e201d558453f12ac5e0fcbb6a668a5674db 100644 (file)
--- a/_manual/01_welcome-to-ardour.html
+++ b/_manual/01_welcome-to-ardour.html
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Welcome to Ardour
+title: Welcome to Ardour!
 ---                        
 
 

diff --git a/_manual/01_welcome-to-ardour/01_about-ardour/01_isnt-this-a-really-complicated-program.html b/_manual/01_welcome-to-ardour/01_about-ardour/01_isnt-this-a-really-complicated-program.html
index 96933a069a9d8c6603745370f7e4ee7932244023..c52a71117ea4aad38ebc1d036c3024c073198527 100644 (file)
--- a/_manual/01_welcome-to-ardour/01_about-ardour/01_isnt-this-a-really-complicated-program.html
+++ b/_manual/01_welcome-to-ardour/01_about-ardour/01_isnt-this-a-really-complicated-program.html
@@ -22,7 +22,7 @@ single track, but the program has been designed around much richer
 capabilities than this.
 </p>
 <p>
-Some people complain that Ardour is not "intuitive" to use - its
+Some people complain that Ardour is not "intuitive" to use &mdash; its
 lead developer has 
 <a href="http://ardour.org/node/3322">some thoughts on that</a>.
 </p>

diff --git a/_manual/01_welcome-to-ardour/02_about-ardour-documentation.html b/_manual/01_welcome-to-ardour/02_about-ardour-documentation.html
index 0bca9a76cd742e1ecbb4db864075f22312520f18..3caf2e20da2de768030f73400cbf4453d1ec5615 100644 (file)
--- a/_manual/01_welcome-to-ardour/02_about-ardour-documentation.html
+++ b/_manual/01_welcome-to-ardour/02_about-ardour-documentation.html
@@ -15,7 +15,7 @@ title: About Ardour documentation
   <kbd class="mod1">x</kbd>.
 </p>
 <p>
-  <kbd>Ctrl x</kbd> means "press the <kbd>Ctrl</kbd> key, keep it pressed
+  <kbd class="mod1">x</kbd> means "press the <kbd class="mod1">&nbsp;</kbd> key, keep it pressed
   and then also press the <kbd>x</kbd> key.
 </p>
 <p>
@@ -29,9 +29,9 @@ title: About Ardour documentation
   Note that different platforms have different conventions for which
   modifier key (Control or Command) to use as the primary or most common
   modifier. When viewing this manual from a machine identifying itself as
-  running OS X, you will see  <kbd>Cmd </kbd> where appropriate (for instance
-  in the first example above). On other machines you will see <kbd>Ctrl </kbd>
-  instead.
+  running OS X, you will see  <kbd>Cmd&nbsp;</kbd> where appropriate (for instance
+  in the first example above). On other machines you will see
+  <kbd>Ctrl&nbsp;</kbd> instead.
 </p>
  
 <h3>Mouse Buttons</h3>
@@ -48,6 +48,14 @@ title: About Ardour documentation
   modifier key, for example <kbd class="mouse mod1">Left</kbd>.
 </p>
 
+<h4>Mouse wheel</h4>
+<p>
+  Some GUI elements can optionally be controlled with the mouse wheel when
+  the pointer is hovering over them. The notation for mouse wheel action is
+  <kbd class="mouse">&uArr;</kbd> <kbd class="mouse">&lArr;</kbd></dt>
+  <kbd class="mouse">&dArr;</kbd> <kbd class="mouse">&rArr;</kbd></dt>
+</p>
+
 <h4>"Context-click"</h4>
 <p>
   Many times the term <kbd class="mouse">context-click</kbd> is used to indicate
@@ -120,6 +128,6 @@ title: About Ardour documentation
 <h3>Warnings</h3>
 <p class="warning">
   Hairy issues that might cause things to go wrong, lose data, impair sound
-  quality, or eat your proverbial goldfish are displayed in this way.
+  quality, or eat your proverbial goldfish, are displayed in this way.
 </p>
 

diff --git a/_manual/17_mixing/02_panning/01_mono_panner.html b/_manual/17_mixing/02_panning/01_mono_panner.html
index f5df157bb0156de20b3ac353b5eddb2ae8590a66..1fe1ccf218b0323b018ad7c553fb7bc37e86a894 100644 (file)
--- a/_manual/17_mixing/02_panning/01_mono_panner.html
+++ b/_manual/17_mixing/02_panning/01_mono_panner.html
@@ -4,9 +4,9 @@ title: Mono Panner
 ---                        
 
 <p>
-The default mono panner distributes 1 input to 2 outputs. Its
-behaviour is controlled by one parameter, called position. The
-default setting is "center" (L=50%, R=50%).
+The default <dfn>mono panner</dfn> distributes 1 input to 2 outputs. Its
+behaviour is controlled by a single parameter, the <dfn>position</dfn>. By
+default, the panner is centered.
 </p>
 
 <h2>Mono Panner User Interface</h2>
@@ -31,18 +31,18 @@ default setting is "center" (L=50%, R=50%).
 <dl class="faq">
 
 <dt>Reset to defaults</dt>
-<dd>Click <kbd class="mod3">right button</kbd></dd>
+<dd>Click <kbd class="mod3 mouse">right</kbd></dd>
 
 <dt>Change to a "hard left"</dt>
-<dd>Double click <kbd>right button</kbd> in the left side
+<dd>Double click <kbd class="mouse">right</kbd> in the left side
   of the panner</dd>
 
 <dt>Change to a "hard right"</dt>
-<dd>Double click <kbd>right button</kbd> in the right side
+<dd>Double click <kbd class="mouse">right</kbd> in the right side
   of the panner</dd>
 
 <dt>Set the position to center</dt>
-<dd>Double Click <kbd>right button</kbd> in the middle of the panner</dd>
+<dd>Double Click <kbd class="mouse">right</kbd> in the middle of the panner</dd>
 </dl>
 
 <h2>Keyboard bindings</h2>
@@ -69,9 +69,12 @@ wheel may be used as follows:
 </p>
 
 <dl>
-<dt>up or left / <kbd class="mod1">up</kbd> or <kbd class="mod1">left</kbd></dt>
-<dd>move position to the left by 1&deg; / 5&deg;</dd>
-
-<dt>down or right / <kbd class="mod1">down</kbd> or <kbd class="mod1">right</kbd></dt>
-<dd>move position to the right by 1&deg; / 5&deg;</dd>
+  <dt><kbd class="mouse">&uArr;</kbd> or <kbd class="mouse">&lArr;</kbd></dt>
+  <dd>move position to the left by 1&deg;</dd>
+  <dt><kbd class="mod1 mouse">&uArr;</kbd> or <kbd class="mod1 mouse">&lArr;</kbd></dt>
+  <dd>move position to the left by 5&deg;</dd>
+  <dt><kbd class="mouse">&dArr;</kbd> or <kbd class="mouse">&rArr;</kbd></dt>
+  <dd>move position to the right by 1&deg;</dd>
+  <dt><kbd class="mod1 mouse">&dArr;</kbd> or <kbd class="mod1 mouse">&rArr;</kbd></dt>
+  <dd>move position to the right by 5&deg;</dd>
 </dl>

diff --git a/_manual/17_mixing/02_panning/03_stereo_panner.html b/_manual/17_mixing/02_panning/03_stereo_panner.html
index 30492f64e16e57fa98073404d242032147d4c843..c25feb7cd3d871270c14595677b93b48c56df32a 100644 (file)
--- a/_manual/17_mixing/02_panning/03_stereo_panner.html
+++ b/_manual/17_mixing/02_panning/03_stereo_panner.html
@@ -6,13 +6,13 @@ title: Stereo Panner
 <p>
   The default <dfn>stereo panner</dfn> distributes two inputs to two outputs. Its
   behaviour is controlled by two parameters, <dfn>width</dfn> and
-  <dfn>position</dfn>. The
-  default settings for the stereo panner are <samp>width=100%</samp> and  
-  <samp>position=center</samp>. 
-  This stereo panner assumes that the signals
+  <dfn>position</dfn>. By default, the panner is centered at full width.
+</p>
+<p>
+  The stereo panner assumes that the signals
   you wish to distribute are either uncorrelated (i.e. totally 
   independent), or that they contain a stereo image which is 
-  <em>mono-compatible</em>, such as a co-incident microphone recording, or a 
+  <dfn>mono-compatible</dfn>, such as a co-incident microphone recording, or a 
   sound stage that has been created with pan pots.<sup><a href="#caveat">*</a></sup>
 </p>
 <p class="note">
@@ -105,47 +105,47 @@ title: Stereo Panner
   To change the position smoothly, press the right button and drag
   within the top half of the panner, then release. The position will
   be limited by the current width setting. <em>Note: you do not need
-  to grab the position indicator in order to drag</em>
+  to grab the position indicator in order to drag.</em>
 </p>
 <p>
   To change the width smoothly, press the right button and drag
   within the lower half of the panner, then release. The width will be
-  limited by the current position setting.<em>Note: you do not need to
-  grab the L/R indicators in order to drag</em>
+  limited by the current position setting. <em>Note: you do not need to
+  grab the L/R indicators in order to drag.</em>
 </p>
 
 <dl class="faq">
 
 <dt>Reset to defaults</dt>
-<dd>Click <kbd class="mod3">right button</kbd></dd>
+<dd>Click <kbd class="mod3 mouse">right</kbd></dd>
 
-<dt>Change to a "hard left"</dt>
-<dd>Double click <kbd class="mod2">right button</kbd> in the upper left half
+<dt>Change to hard left</dt>
+<dd>Double click <kbd class="mod2 mouse">right</kbd> in the upper left half
   of the panner</dd>
 
-<dt>Change to a "hard right"</dt>
-<dd>Double click <kbd class="mod2">right button</kbd> in the upper right half
+<dt>Change to a hard right</dt>
+<dd>Double click <kbd class="mod2 mouse">right</kbd> in the upper right half
   of the panner</dd>
 
 <dt>Move position as far left as possible, given width</dt>
-<dd>Double click <kbd>right button</kbd> in the upper left half of the
+<dd>Double click <kbd class="mouse">right</kbd> in the upper left half of the
   panner</dd>
 
 <dt>Move position as far right as possible, given width</dt>
-<dd>Double click <kbd>right button</kbd> in the upper right half of the
+<dd>Double click <kbd class="mouse">right</kbd> in the upper right half of the
   panner</dd>
 
 <dt>Set the position to center</dt>
-<dd>Click <kbd>right button</kbd> in the upper middle of the panner</dd>
+<dd>Click <kbd class="mouse">right</kbd> in the upper middle of the panner</dd>
 
 <dt>Reset to maximum possible width</dt>
-<dd>Double click <kbd>right button</kbd> on the lower left side</dd>
+<dd>Double click <kbd class="mouse">right</kbd> on the lower left side</dd>
 
 <dt>Invert (flip channel assignments)</dt>
-<dd>Double click <kbd>right button</kbd> on the lower right side</dd>
+<dd>Double click <kbd class="mouse">right</kbd> on the lower right side</dd>
 
 <dt>Set width to 0&deg;</dt>
-<dd>Double click <kbd>right button</kbd> in the lower middle</dd>
+<dd>Double click <kbd class="mouse">right</kbd> in the lower middle</dd>
 </dl>
 
 <h4>Keyboard bindings</h4>
@@ -178,17 +178,14 @@ title: Stereo Panner
 </p>
 
 <dl>
-<dt>left / <kbd class="mod1">left</kbd></dt>
-<dd>increase width by 1&deg; / 5&deg;</dd>
-
-<dt>right / <kbd class="mod1">right</kbd></dt>
-<dd>decrease width by 1&deg; / 5&deg;</dd>
-
-<dt>up / <kbd class="mod1">up</kbd></dt>
-<dd>move position 1&deg; / 5&deg; to the left</dd>
-
-<dt>down / <kbd class="mod1">down</kbd></dt>
-<dd>move position 1&deg; / 5&deg;to the right</dd>
+  <dt><kbd class="mouse">&lArr;</kbd> / <kbd class="mod1 mouse">&lArr;</kbd></dt>
+  <dd>increase width by 1&deg; / 5&deg;</dd>
+  <dt><kbd class="mouse">&rArr;</kbd> / <kbd class="mod1 mouse">&rArr;</kbd></dt>
+  <dd>decrease width by 1&deg; / 5&deg;</dd>
+  <dt><kbd class="mouse">&uArr;</kbd> / <kbd class="mod1 mouse">&uArr;</kbd></dt>
+  <dd>move position 1&deg; / 5&deg; to the left</dd>
+  <dt><kbd class="mouse">&dArr;</kbd> / <kbd class="mod1 mouse">&dArr;</kbd></dt>
+  <dd>move position 1&deg; / 5&deg;to the right</dd>
 </dl>
 
 <h2><a name="caveat"></a>Stereo panning caveats</h2>
@@ -205,7 +202,7 @@ Let's take a closer look at what happens when you record a source at 45° to the
 right side with an ORTF stereo microphone array and then manipulate the width.
 </p>
 <p>
-For testing, we apply a pink noise signal to both inputs of an Ardour stereo
+For testing, we apply a <dfn>pink noise</dfn> signal to both inputs of an Ardour stereo
 bus with the stereo panner, and feed the bus output to a two-channel analyser. 
 Since pink noise contains equal energy per octave, the expected readout is a
 straight line, which would indicate that our signal chain does not color the
@@ -219,7 +216,7 @@ control LV2 to set the level difference and time delay. Ignore the Trim/Gain
 analyser.
 </p>
 <p> 
-Recall that an ORTF microphone pair consists of two cardioids spaced 17 cm
+Recall that an <dfn>ORTF</dfn> microphone pair consists of two cardioids spaced 17 cm
 apart, with an opening angle of 110°.
 For a far source at 45° to the right, the time difference between the capsules 
 is 350 &mu;s or approximately 15 samples at 44.1 kHz. The level difference 
@@ -249,3 +246,4 @@ carefully for artefacts if you manipulate unknown stereo signals &mdash; many
 orchestra sample libraries for example do contain time-delay components.
 </p>
 
+