Updated some Edit / Region operations

diff --git a/include/separate-range.html b/include/separate-range.html
deleted file mode 100644 (file)
index e8e7a88..0000000
--- a/include/separate-range.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<p>
-  A final new editing feature is an operation in the context menu of a
-  range labelled <kbd class="menu">Separate Regions Under Range</kbd>.
-  This splits any selected regions that are covered by the range at both
-  ends of the range (or just one, if the range only covers part of the
-  region). This makes it easy to generate regions that correspond
-  precisely to a range.
-</p>
-

diff --git a/include/separate-under.html b/include/separate-under.html
index 773e6c61fdf50cfd240d98f633a436908d5e8268..8e75458bf8450108764c04448410d4bda05480da 100644 (file)
--- a/include/separate-under.html
+++ b/include/separate-under.html
@@ -1,24 +1,42 @@
 
+<h2>Separate Under</h2>
+
 <p>
-  You may have a situation where you have positioned one region over another,
-  and you just want to cut the lower region so that it directly adjoins both
-  ends of the overlapping one, with no overlaps. To do this, select the upper
-  region, then choose <kbd class="menu">Edit &gt; Separate &gt; Separate
-  Under</kbd>. This will split the lower region so that it no longer overlaps
-  the upper region at all. <br>
-  Here is an example where we start with a short region placed so that it
-  overlaps a longer region:
-</p>
-<img src="/images/a3_before_separate_under.png" alt="region arrangement before separate under" />
-<p>
-  When we perform the <dfn>Separate Under</dfn> edit, the lower region splits
-  in two, with boundaries exactly positioned at the edges of the upper region:
+  When one region is over another, and the lower region has to be cut so that it
+  directly adjoins both ends of the overlapping one, with no overlaps, the <dfn>
+  Separate Under</dfn> tool can be a very efficient time-saver.
+  With the upper region selected, the <kbd class="menu">Edit &gt; Separate &gt; Separate
+  Under</kbd> menu will split the lower region so that it no longer overlaps
+  the upper region at all.
 </p>
-<img src="/images/a3_after_separate_under.png" alt="region arrangement after separate under" />
+
+<figure>
+  <img src="/images/before-separate-under.png" alt="region arrangement before separate under">
+  <img src="/images/after-separate-under.png" alt="region arrangement after separate under">
+  <figcaption>
+    Region arrangement before and after 'Separate Under'
+  </figcaption>
+</figure>
+
 <p>
   If the upper region covers only one end of the lower region, then this
-  operation is equivalent to
-  <a href="@@trimming-regions#trimtonextprevious">Trim to Next or Trim to Previous</a>,
+  operation is equivalent to <a href="@@trimming-regions">Trim to Next or Trim to Previous</a>,
   depending on which end is covered.
 </p>
 
+<h2>Separate Using Range</h2>
+<p>
+  A loop or punch range can also be used to slice a region. By using the
+  <kbd class="menu">Edit &gt; Separate &gt; Separate Using Loop/Punch Range</kbd>,
+  any selected regions that are covered by the range at both ends of the range,
+  or just one if the range only covers part of the region. This makes it easy to
+  generate regions that correspond precisely to a range.
+</p>
+
+<figure>
+  <img src="/images/before-separate-loop.png" alt="region arrangement before separate using loop range">
+  <img src="/images/after-separate-loop.png" alt="region arrangement after separate using loop range">
+  <figcaption>
+    Region arrangement before and after 'Separate Using Loop Range'
+  </figcaption>
+</figure>

diff --git a/include/stretching-regions.html b/include/stretching-regions.html
index f6a88a87280ac3e73fc89c22bf4656fb761b0e31..0f43c8640fa6c12fcd8b0d936d36aacb4364ff98 100644 (file)
--- a/include/stretching-regions.html
+++ b/include/stretching-regions.html
@@ -59,7 +59,7 @@
   <dt><dfn>Contents</dfn></dt><dd>The type of audio the region is made of. Ardour will fine-tune
     its algorithm based on this content, see below</dd>
   <dt><dfn>Minimize time distortion</dfn></dt><dd>Tries to reduce the smearing
-    of the audio created by the pahse vocoding process</dd>
+    of the audio created by the phase vocoding process</dd>
   <dt>a <dfn>Progress</dfn> bar</dt><dd>showing the operation in progress.</dd>
 </dl>
 

diff --git a/include/strip-silence-from-audio-regions.html b/include/strip-silence-from-audio-regions.html
index a1e07e07a0cb0ddaeec639e9e5ad7462a78ff74f..4ac2b70166ae544feb0ca2033c7205d09304c871 100644 (file)
--- a/include/strip-silence-from-audio-regions.html
+++ b/include/strip-silence-from-audio-regions.html
@@ -1,18 +1,54 @@
+<figure>
+  <img src="/images/strip-silence-window.png" alt="The Strip Silence window">
+  <figcaption>
+    The Strip Silence window
+  </figcaption>
+</figure>
 
 <p>
-  From the region context menu, choose <kbd class="menu">Edit &gt; Strip
-  Silence</kbd> to detect silence (based on a user-chosen threshold in
-  <abbr title="Decibels relative to Full Scale">dBFS</abbr>), split a
-  region based on the boundaries of the silent segments, and remove the
-  silence. You can also specify a minimum length for silence&mdash;useful
-  when editing very percussive material and just needing to
-  automatically trim the ends of a region. The dialog looks like this:
+  The <dfn>Strip Silence</dfn> tool allows to remove the parts of one or multiple
+  regions that are below a user-defined silence threshold. It does <em>not</em>
+  destroy the underlying audio, but trims the regions according to the silence
+  threshold parameter. The edit applies to all selected regions, allowing batch
+  processing.
 </p>
-<img src="/images/a3_strip_silence.png" alt="strip silence dialog" />
+
 <p>
-  The edit applies to all selected regions, allowing batch processing.
-  You can also see in the screenshot how the main editor window is used
-  to show silent segments and report the number and durations of the
-  shortest segments.
+  The window, accessible either through the <kbd class="menu">Region &gt; Edit &gt; Strip
+  Silence</kbd> menu or <kbd class="menu"><kbd class="mouse">right</kbd> click on a region
+  &gt; <em>Name_Of_The_Region</em> &gt; Edit &gt; Strip Silence</kbd>is made of:
 </p>
 
+<dl>
+  <dt><dfn>Threshold</dfn></dt>
+    <dd>The audio level under which the audio is considered silent (in <abbr
+    title="Decibels relative to Full Scale">dBFS</abbr>)</dd>
+  <dt><dfn>Minimum length</dfn></dt>
+    <dd>A minimum number of samples for Ardour to create a split. Under this
+      number, the region won't be sliced</dd>
+  <dt><dfn>Fade length</dfn></dt>
+    <dd>Ardour adds fades, both in and out, to the trimmed regions, to the created
+      region (so the sliced regions are longer by both the in and out fades duration,
+      expressed in samples)</dd>
+  <dt>A progress bar</dt>
+    <dd>showing the time Ardour takes to compute the trimming based on the current
+      parameters</dd>
+</dl>
+
+<p>
+  Changing any parameter in the window is reflected in the main editor: the silent
+  segments are highlighted and the number and durations of the shortest segments is
+  displayed, helping fine-tune the parameters.
+</p>
+
+<figure>
+  <img src="/images/strip-silence-audio.png" alt="strip silence: view of the audio">
+  <img src="/images/strip-silence-after.png" alt="strip silence: view of the audio after">
+  <figcaption>
+    Strip Silence : a view of the audio while changing the parameters, and after treatment
+  </figcaption>
+</figure>
+
+<p class="note">The minimum length for silence can be useful when editing very
+  percussive material and just needing to automatically trim the ends of a region.
+</p>

diff --git a/include/trimming-regions.html b/include/trimming-regions.html
index d5ca391171bd59606bd6c34259b76698c3e8098f..18c87cd1c25f208cf651b3abfa85f4393feef8f9 100644 (file)
--- a/include/trimming-regions.html
+++ b/include/trimming-regions.html
@@ -7,68 +7,49 @@
 </p>
 
 <h2>Drag-Trimming With the Mouse</h2>
+
+<figure class="right">
+  <img src="/images/trimming-region-before.png" alt="Trimming region - before">
+  <img src="/images/trimming-region-after.png" alt="Trimming region - after">
+  <figcaption>
+    Trimming region - before and after
+  </figcaption>
+</figure>
+
 <p>
-  In object mode, move the pointer near the beginning or end of the region.
-  The cursor will change to indicate that trimming is possible, and you then
-  <kbd class="mouse">Left</kbd>-drag the edge of the region.
+  In Grab mode, moving the pointer near the beginning or end of the region changes
+  the cursor to indicate that trimming is possible, and the edge of the region can
+  then be <kbd class="mouse">Left</kbd>-dragged in both directions.
 </p>
 <p>
   Trimming will obey <a href="@@grid-controls">Snap settings</a>.
 </p>
 
-<h2>Click Trimming With the Mouse</h2>
-<p>
-  <kbd class="mouse">Left</kbd>-click in the colored bar at the bottom of a region.
-  If you are nearer to the start of a region, this will trim the start time to the
-  position of the pointer. If you are nearer to the end of a region, it will trim the
-  end time.
-</p>
-
-<h2>Keyboard Shortcuts for Trimming</h2>
+<h2>Other Trimming operations</h2>
 <p>
   There are several commands for region trimming. Some use the
   <a href="@@edit-point-control">edit point</a> to determine where
   to trim to. Some are not bound to any keys by default (but could be via the
-  Keybindings Editor).
+  <a href="@@default-keyboard-bindings">Keybindings Editor</a>).
 </p>
-
-<dl class="wide-table">
-  <dt><kbd class="menu">Region/trim-front</kbd> <kbd>j</kbd></dt>
-  <dd>Trim selected region(s) start to edit point.</dd>
-  <dt><kbd class="menu">Region/trim-end</kbd> <kbd>k</kbd></dt>
-  <dd>Trim selected region(s) end to edit point.</dd>
-</dl>
-
-<h2 id="trimtonextprevious">Trim to Next/Previous Region</h2>
 <p>
-  Sometimes you just want to extend the start or end of region so that it reaches
-  the end or start of an adjacent region. There is now an operation accessible
-  from the region context menu, under <kbd class="menu">Edit &gt;Trim &gt; Trim to
-  Next</kbd> or <kbd class="menu">Edit &gt; Trim &gt; Trim to Previous</kbd>. This
-  will extend the selected regions so they directly adjoin their neighbours, unless
-  their source files are not long enough, in which case they will be extended to the
-  maximum possible. Trim to Next will extend the end of the selected regions to the
-  start of the next region; Trim to Previous will extend the start of the selected
-  regions to the end of the previous region.
+  These command are both in the <kbd class="menu">Region &gt; Trim</kbd> main menu
+  (with a region selected) or in the contect menu of a region, <kbd class="menu">
+  <kbd class="mouse">right</kbd> click on a region &gt; <em>Name_Of_The_Region</em>
+  &gt; Trim</kbd>
 </p>
-<dl class="wide-table">
-  <dt><kbd class="menu">Region/trim-to-previous-region</kbd> <kbd class="mod1">j</kbd></dt>
-  <dd>Trim the start of selected region(s) to the end of the previous
-  region.</dd>
-  <dt><kbd class="menu">Region/trim-to-next-region</kbd> <kbd class="mod1">k</kbd></dt>
-  <dd>Trim the end of selected region(s) to the start of the following
-  region.</dd>
-</dl>
 
-<h2>Other Possible Commands for Trimming</h2>
-<p>
-  These are not bound to any keys by default, but could be via the Keybindings
-  Editor. They can also be sent via OSC or other control protocols.
-</p>
 <dl class="wide-table">
-  <dt><kbd class="menu">Region/trim-region-to-loop</kbd></dt>
-  <dd>Trim region to match the current loop range.</dd>
-  <dt><kbd class="menu">Region/trim-region-to-punch</kbd></dt>
-  <dd>Trim region to match the current punch range.</dd>
+  <dt><dfn>Trim Start at Edit Point</dfn> (<kbd>j</kbd>)</dt>
+  <dd>Trim selected region(s) start to edit point.</dd>
+  <dt><dfn>Trim End at Edit Point</dfn> (<kbd>k</kbd>)</dt>
+  <dd>Trim selected region(s) end to edit point.</dd>
+  <dt><dfn>Trim to Loop/Punch</dfn></dt>
+  <dd>Trim selected region(s) beginning and end to the loop/punch boundaries (if it exists).</dd>
+  <dt><dfn>Trim to Previous</dfn> (<kbd class="mod1">j</kbd>)</dt>
+  <dd>Trim the start of selected region(s) to the end of the previous region.
+    If the region is too short, it is extended to it's maximum to the left.</dd>
+  <dt><dfn>Trim to Next</dfn> (<kbd class="mod1">k</kbd>)</dt>
+  <dd>Trim the end of selected region(s) to the start of the following region.
+    If the region is too short, it is extended to it's maximum to the right.</dd>
 </dl>
-

diff --git a/source/images/a3_after_separate_under.png b/source/images/a3_after_separate_under.png
deleted file mode 100644 (file)
index 74933fc..0000000
Binary files a/source/images/a3_after_separate_under.png and /dev/null differ

diff --git a/source/images/a3_before_separate_under.png b/source/images/a3_before_separate_under.png
deleted file mode 100644 (file)
index 012e04e..0000000
Binary files a/source/images/a3_before_separate_under.png and /dev/null differ

diff --git a/source/images/a3_strip_silence.png b/source/images/a3_strip_silence.png
deleted file mode 100644 (file)
index 197295c..0000000
Binary files a/source/images/a3_strip_silence.png and /dev/null differ

diff --git a/source/images/after-separate-loop.png b/source/images/after-separate-loop.png
new file mode 100644 (file)
index 0000000..e9753aa
Binary files /dev/null and b/source/images/after-separate-loop.png differ

diff --git a/source/images/after-separate-under.png b/source/images/after-separate-under.png
new file mode 100644 (file)
index 0000000..f806376
Binary files /dev/null and b/source/images/after-separate-under.png differ

diff --git a/source/images/before-separate-loop.png b/source/images/before-separate-loop.png
new file mode 100644 (file)
index 0000000..66f61ff
Binary files /dev/null and b/source/images/before-separate-loop.png differ

diff --git a/source/images/before-separate-under.png b/source/images/before-separate-under.png
new file mode 100644 (file)
index 0000000..7a8d741
Binary files /dev/null and b/source/images/before-separate-under.png differ

diff --git a/source/images/strip-silence-after.png b/source/images/strip-silence-after.png
new file mode 100644 (file)
index 0000000..8ff3a32
Binary files /dev/null and b/source/images/strip-silence-after.png differ

diff --git a/source/images/strip-silence-audio.png b/source/images/strip-silence-audio.png
new file mode 100644 (file)
index 0000000..bbbafe2
Binary files /dev/null and b/source/images/strip-silence-audio.png differ

diff --git a/source/images/strip-silence-window.png b/source/images/strip-silence-window.png
new file mode 100644 (file)
index 0000000..f2f7ec5
Binary files /dev/null and b/source/images/strip-silence-window.png differ

diff --git a/source/images/trimming-region-after.png b/source/images/trimming-region-after.png
new file mode 100644 (file)
index 0000000..14499ae
Binary files /dev/null and b/source/images/trimming-region-after.png differ

diff --git a/source/images/trimming-region-before.png b/source/images/trimming-region-before.png
new file mode 100644 (file)
index 0000000..01e8922
Binary files /dev/null and b/source/images/trimming-region-before.png differ