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=3579f930a6f8862c7c7cb6fed6331a7f1313bce0;hb=df2bf696d87a37761837d367444abb883660d46d;hp=c020988d49fd5518f1b7e1c10cbd585d5cb05401;hpb=b19b09025d678f35bc882f17e73718009509b4ae;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 c020988..3579f93 100644
--- a/_manual/25_tempo-meter/01_tempo-and-meter.html
+++ b/_manual/25_tempo-meter/01_tempo-and-meter.html
@@ -6,13 +6,12 @@ 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.</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>
 
+<h3>Tempo</h3>
 <br>
-TEMPO
-</br>
-<br>
-<p>In PROGRAM_NAME, tempo can be adjusted in several ways:
+<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.
@@ -29,6 +28,7 @@ this is the preferred way to match the tempo to previously recorded material.</l
 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,
 it is, however, a useful way to adjust the first tempo for a quick result.
 </li>
+</p>
 <p>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.
 Similarly an audio-locked tempo may be locked to music by right clicking it an selecting the "Lock to Music" entry.
@@ -54,11 +54,10 @@ The new tempo will be the same as the tempo at the position of the mouse click (
 <.p>
 <p>To copy a tempo, hold down the primary modifier and drag the tempo you wish to copy.</p>
 
+<h3>Meter</h3>
 <br>
-METER
-<br>
-Meter positions beats using the musical pulse of a tempo, and groups them into bars using its number of divisions per bar.
-
+<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).
 It can be moved freely and is locked to audio.
 </p>
@@ -73,18 +72,18 @@ a break in music which cannot be counted in beats.
 That bar number cannot be changed, nor can tempo motion allow the previous bar to overlap.
 If you need another bar, lock the meter to music again (right click->"Lock to Music"), drag the meter to the desired bar and re-lock to audio.
   You may now drag your new bar freely again.
-  <p>
+  </p>
 <br>
-To change a meter, double click it. A dialog will appear.
+<li>To change a meter, double click it. A dialog will appear.</li>
 <br>
-To copy a meter, hold down control and drag it.
+<li>To copy a meter, hold down control and drag it.</li>
 
 <br>
-Techniques
+<h3>Techniques </h3>
 <br>
-As a general approach, the best way to control tempo ramps is to use them in pairs (disregarding the first one).
-
-<p>Lets imagine we want to match PROGRAM_NAMEs click to a drum performance recorded in 'free time'.
+<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>
 The first thing we need to do is determine where the first beat is. Drag the first meter to that position.
 </p>
 <p>Now the first click will be in time with the first beat. To get all the other beats to align, we listen to the drums
@@ -131,15 +130,14 @@ would be good for this, but you want an accelerando to that point.
 <p>Holding down the constraint modifier, and with snap set to 'TC Frames', grab the BBT ruler just *after* 4|1|0.
 Drag the ruler so that 4|1|0 snaps to the 'phone' frame.
 </p>
-<p>Notice what happened : The second tempo was changed.
-</p>
-<p>You had set a musical position for the second tempo marker. It was not alignaed with the frame you wanted, so
+<p class="note">Notice what happened : The second tempo was changed.<br>
+You had set a musical position for the second tempo marker. It was not aligned with the frame you wanted, so
 you dragged the BBT ruler, making the second tempo provide enough pulses over the ramp for 4|1|0 to align with the desired frame.
 </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>
-General note:
+<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
 isolated segments, preventing the listening fatigue of a fixed form.