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=e1ed4a8a83adb187c2db5aaea48e1955bcb464f0;hb=6f692df5474c07c966fc650d65a05ec6a1398d17;hp=90cdf2933ce911b9243857f8e2175a872da03d8a;hpb=6247811a05b522a245bcf86185d74997a09be1ed;p=ardour-manual-diverged

diff --git a/_manual/25_tempo-meter/01_tempo-and-meter.html b/_manual/25_tempo-meter/01_tempo-and-meter.html
index 90cdf29..e1ed4a8 100644
--- a/_manual/25_tempo-meter/01_tempo-and-meter.html
+++ b/_manual/25_tempo-meter/01_tempo-and-meter.html
@@ -9,33 +9,36 @@ menu_title: Tempo and Meter
 <p>Tempo provides a musical pulse, which is divided into beats and bars by a meter.</p>
 
 <br>
-TEMPOS
+<h3>Tempo</h3>
 </br>
 <br>
-<p>In PROGRAM_NAME, tempos can be adjusted in several ways:
+<p>In PROGRAM_NAME, tempo can be adjusted in several ways:
 
-by double clicking on a tempo marker.
+<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.
+</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.
-
-NOTE - When dragging the BBT ruler, musical snap has no effect, however be warned that non-musical snap is in effect if enabled.
+<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>
+<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.
-
-by holding down the constaint modifier while dragging a tempo vertically.
+</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,
-it is, however, a useful way to adjust the first tempo for a quick result.</p>
-
-<p>Tempos may be locked to audio or musical time. You may change this by right-clicking on a tempo.
+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.
-
-Audio locked tempos stay in their frame position as their neigbours positions are altered. Their pulse (musical) position will change as their neighbours move.
-Music locked tempos move their frame position as their neighbours are moved, but keep their pulse position (they will move as the music is moved).</p>
+</p>
+<p>Audio locked tempos stay in their frame position as their neigbours positions are altered. Their pulse (musical) position will change as their neighbours move.
+Music locked tempos move their frame position as their neighbours are moved, but keep their pulse position (they will move as the music is moved).
+</p>
 <br>
-Tempos may also be remped or constant.
+Tempo may also be remped or constant.
 
 <p>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).</p>
@@ -55,8 +58,9 @@ The new tempo will be the same as the tempo at the position of the mouse click (
 <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.
-
+<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).
 It can be moved freely and is locked to audio.
 </p>
@@ -71,11 +75,11 @@ 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
@@ -96,7 +100,7 @@ We now locate the earliest position where the click doesn't match, and place a n
 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.
-<p>
+<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.
@@ -139,7 +143,7 @@ you dragged the BBT ruler, making the second tempo provide enough pulses over th
 <br>
 General note:
 
-<p>Audio locked meters can be very useful when composing, as they allow a continuous piece of music to be worked on in
+<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.
 Reassembly is left as an excercise for the reader.
 </p>