X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=_manual%2F25_tempo-meter%2F01_tempo-and-meter.html;h=4060e569d56224cd08dd544fc510ccb2b412af5f;hb=c0d9fe0729ef5845066a0456cdd99f28e3a74aae;hp=5277a56082ae0f18cbde8b219661529197441e70;hpb=30d34f71c4d33ab846df00fad3d5cba040aea83b;p=ardour-manual

diff --git a/_manual/25_tempo-meter/01_tempo-and-meter.html b/_manual/25_tempo-meter/01_tempo-and-meter.html
index 5277a56..4060e56 100644
--- a/_manual/25_tempo-meter/01_tempo-and-meter.html
+++ b/_manual/25_tempo-meter/01_tempo-and-meter.html
@@ -7,27 +7,31 @@ menu_title: Tempo and Meter
 <p>Tempo and meter belong together. without both, there is no way to know where a beat lies in time.</p>
 
 <p>Tempo provides a musical pulse, which is divided into beats and bars by a meter.
-When you change tempo or move an audio-locked meter, all objects on the timeline that are glued to bars and beats (locations, regions) will move in sympathy.</p>
+  When you change tempo or move an audio-locked meter, all objects on the timeline that are glued to bars and beats (locations, regions) will move in sympathy.
+</p>
+<p class="note">When performing meter or tempo operations, it is advised that you show the BBT ruler (available by right-clicking an existing marker or ruler name),
+  and ensure that the constraint modifier is set (in Preferences->User Interaction) so that no other modifiers share its key combination.<br>
+  The constraint modifier is the "Constrain drags using : " setting under the "When Beginning a Drag" heading. One viable setting is control-shift.
+</p>
 
 <h3>Tempo</h3>
-<br>
 <p>Tempo can be adjusted in several ways:
 
 <ul><li>by double clicking on a tempo marker.
-this opens the tempo dialog which will allow you to enter the tempo directly into an entry box.
+This opens the tempo dialog which will allow you to enter the tempo directly into an entry box.
 </li>
 
 <li>  by using the constraint modifier (which is set in Preferences->User Interaction) to drag the beat/bars in the BBT ruler or the tempo/meter lines.
-this is the preferred way to match the tempo to previously recorded material.</li>
+This is the preferred way to match the tempo to previously recorded material.</li>
 <p class ="note">
   NOTE - When dragging the BBT ruler, musical snap has no effect, however be warned that non-musical snap is in effect if enabled.
        Snapping to a minute while dragging a beat may result in some verly slow tempos.
        Snapping a beat to a video frame however is an incredibly useful way to ensure your soundtrack is punchy and synchronised to the sample.
 </p>
 <li>by holding down the constaint modifier while dragging a tempo vertically.
-this is best used for complex tempo solving, as it allows you to change the position and tempo of a tempo marker in the same drag,
+This is used for more complex tempo solving, as it allows you to change the position and tempo of a tempo marker in the same drag,
 it is, however, a useful way to adjust the first tempo for a quick result.
-</li>
+</li></ul>
 </p>
 <p>A tempo may be locked to audio or musical time. You may change this by right-clicking on a tempo.
 If a tempo is locked to music, an entry will be available to lock it to audio.
@@ -39,25 +43,40 @@ Music locked tempo marks move their frame position as their neighbours are moved
 <br>
 <p>A tempo may be remped or constant.
 
-<ul><li>A constant tempo will keep the sesion tempo constant until the next tempo section, at which time it will jump instantly to the next tempo.
-these are mostly useful abrupt changes, and is the way in which traditional DAWs deal with tempo changes (abrupt jumps in tempo).</li>
+  <ul>
+    <li>A constant tempo will keep the sesion tempo constant until the next tempo section, at which time it will jump instantly to the next tempo.
+      These are mostly useful abrupt changes, and is the way in which traditional DAWs deal with tempo changes (abrupt jumps in tempo).
+      <br>
+  </li>
 
-<li>A ramped tempo increases its tempo over time so that when the next tempo section has arrived, the sesion tempo is the same as the second one.
-this is useful for matching the session tempo to music which has been recorded without click tracks or electronic clocks.
+    <li>A ramped tempo increases its tempo over time so that when the next tempo section has arrived, the sesion tempo is the same as the second one.
+This is useful for matching the session tempo to music which has been recorded without a metronome.
 Ramps may also be used as a compositional tool, but more on this later.
 Note that a ramp requires two points - a start and an end tempo. The first tempo in a new session is ramped, but appears to be constant as it has no tempo to ramp to. It is only when you add a new tempo and adjust one of them that you will hear a ramp.
-The same applies to the last tempo in the session - it will always appear to be constant until a new last tempo is added and changed.
-</li>
-</ul>
+      The same applies to the last tempo in the session - it will always appear to be constant until a new last tempo is added and changed.
+  </li>
+  </ul>
+</p>
+<br>
+<p>
+  <img src="/images/constant-tempo.png" alt="A constant tempo displaying the tempo at the playhead in the audio clock">
+  <br>
+  A series of constant tempo markers. The tempo at the playhead position is the same as the previous tempo.
+</p>
+<br>
+<p>
+  <img src="/images/ramped-tempo.png" alt="A ramped tempo displaying the tempo at the playhead in the audio clock">
+  <br>
+  A ramped tempo marker. The tempo at the playhead position is approaching the second tempo. Because the playhead is equidistant (in beats) between the
+  two markers, the tempo at the playhead is the average of the two.
 </p>
 <br>
 <p>To add a new tempo, use the primary modifier and click on the tempo line at the desired position.
 The new tempo will be the same as the tempo at the position of the mouse click (it will not change the shape of the ramp).
-<.p>
+</p>
 <p>To copy a tempo, hold down the primary modifier and drag the tempo you wish to copy.</p>
 
 <h3>Meter</h3>
-<br>
 <p>Meter positions beats using the musical pulse of a tempo, and groups them into bars using its number of divisions per bar.
 </p>
 <p>The first meter in a new session may be moved freely. It has an associated tempo which cannot be dragged by itself (although all others can).
@@ -80,9 +99,7 @@ If you need another bar, lock the meter to music again (right click->"Lock to Mu
 <br>
 <li>To copy a meter, hold down control and drag it.</li>
 
-<br>
 <h3>Techniques </h3>
-<br>
 <p>As a general approach, the best way to control tempo ramps is to use them in pairs.
 </p>
 <p>Lets imagine we want to match the click to a drum performance recorded in 'free time'.<br>
@@ -98,24 +115,22 @@ You will see this reflected in the tempo lines.. they won't quite match the drum
 We now locate the earliest position where the click doesn't match, and place a new tempo just before this.
 Two bars later, place another new tempo.
 </p>
-Now while dragging any beat *after* the second new tempo, watch the drum audio and tempo lines until they align.
+Now while dragging any beat <strong>after</strong> the second new tempo, watch the drum audio and tempo lines until they align.
 <p class="note">
 Notice what is happeneing here: the tempo previous to your mouse pointer is being changed so that the beat you grabbed
 aligns with the pointer.
-Notice that the tempo lines previous to the changed one also move. This is because the previous tempo is ramping *to* the tempo you are changing.
+Notice that the tempo lines previous to the changed one also move. This is because the previous tempo is ramping <strong>to</strong> the tempo you are changing.
 Look further to the left. The tempo lines in the first four bars do not move.
 </p>
 <p>Again, some time later the click will not align. I didn't say this was easy.
 </p>
 
-<p>Repeat the same technique : add two new tempos and drag the BBT ruler *after* the newest tempo so that the beats align with the audio again.
+<p>Repeat the same technique : add two new tempos and drag the BBT ruler <strong>after</strong> the newest tempo so that the beats align with the audio again.
 </p>
 
 <p>In a general sense, adding tempo markers in pairs allows you to 'pin' your previous work while you move further to the right.
 </p>
-<br>
-Another use case : matching accelerando.
-<br>
+<h3>Another use case : matching accelerando</h3>
 <p>Imagine you have some video and have located where your music cue begins. Move the first meter to that frame
 (you may snap to TC frames, but not music with an audio locked meter).
 </p>
@@ -129,7 +144,7 @@ would be good for this, but you want an accelerando to that point.
 <p>
   Add a tempo ar bar 4.
 </p>
-<p>Holding down the constraint modifier, and with snap set to 'TC Frames', grab the BBT ruler just *after* 4|1|0.
+<p>Holding down the constraint modifier, and with snap set to 'TC Frames', grab the BBT ruler just <strong>after</strong> 4|1|0.
 Drag the ruler so that 4|1|0 snaps to the 'phone' frame.
 </p>
 <p class="note">Notice what happened : The second tempo was changed.<br>
@@ -138,7 +153,6 @@ you dragged the BBT ruler, making the second tempo provide enough pulses over th
 </p>
 <p>If your ramp doesn't feel correct, you may add more points within it and keep adjusting beat positions in a similar manner.
 </p>
-<br>
 <h3>General</h3>
 
 <p>Audio locked meters can be useful when composing, as they allow a continuous piece of music to be worked on in