Reworked the push/pull trimming

diff --git a/include/pushpull-trimming.html b/include/pushpull-trimming.html
index e3c9e62464ebf1a2913352c896b24c3b4f2bfce5..d00bf07c8aabe0b236bd2d349493c9459b3653ab 100644 (file)
--- a/include/pushpull-trimming.html
+++ b/include/pushpull-trimming.html
@@ -1,36 +1,42 @@
 
 <p>
 
 <p>

-  Normally, when you trim regions by dragging with the mouse, it affects
+  Normally, when trimming regions by dragging with the mouse, it affects

   only the selected regions. Their lengths are directly affected by the
   only the selected regions. Their lengths are directly affected by the

-  trim operation, but nothing else is. Sometimes though, you might like
-  to trim a region that directly adjoins another, and keep this relationship
-  the same&mdash;you are not trying to make one of the regions extend
-  over the other&mdash;you would like the junction to move in one
-  direction or the other as part of the trim. This requires trimming both
+  trim operation, but nothing else is. Sometimes though, when trimming a region
+  that directly adjoins another, the desired result is to move the boundary
+  between the regions and not to make these regions overlap. This requires trimming both

   regions on either side of the junction, in opposite directions.
   regions on either side of the junction, in opposite directions.

-  <dfn>Push/Pull trim</dfn>, activated by pressing shift key before
-  starting the drag, will do just that. Here's a few pictures to show the
-  difference in the results of a normal trim and push/pull trim. First,
-  the initial situation:
+  <dfn>Push/Pull trim</dfn>, activated by pressing <kbd class="mod3n"></kbd> key before
+  starting the drag, will do just that.

 </p>
 </p>

-<img src="/images/a3_before_trim.png" alt="region arrangement before trim" />
-<p>
-  Here is what happens after we trim the right hand (selected) region by
-  dragging its starting position earlier:

 </p>
 </p>

-<img src="/images/a3_after_trim.png" alt="region arrangement after a trim" />
+  The following pictures show the difference in the results of a normal trim and
+  a push/pull trim:
+</p>
+
+<figure>
+  <img src="/images/before-trim.png" alt="region arrangement before trim" />
+  <img src="/images/after-trim.png" alt="region arrangement after a trim" />
+  <img src="/images/after-push-trim.png" alt="region arrangement after a push trim" />
+  <figcaption>
+    Trimming vs. push/pull trimming. Before trimming, After a simple trim, After a push/pull trim
+  </figcaption>
+</figure>
+

 <p>
 <p>

-  You can see that it now overlaps the earlier region and a crossfade has
-  been created between them.
+  In the initial situation, before trimming, two adjascent regions are present,
+  the rightmost-one being selected.

 </p>
 <p>
 </p>
 <p>

-  Lets look now at what happens if we do the same trim, but <kbd
-  class="mouse mod3">Left</kbd>-dragging to turn it into a push-pull trim instead:
+  The simple trim, obtained by dragging the selected region's starting position earlier, overlaps
+  the earlier region. A crossfade has been manually created between them, so their
+  sound will fade from the leftmost region to the rightmost one.

 </p>
 </p>

-<img src="/images/a3_after_push_trim.png" alt="region arrangement after a push trim" />

 <p>
 <p>

-  There is no overlap, and the end of the earlier region has been moved
-  along with the start of the later region, so that they still directly
-  adjoin each other.
+  If the same trim is done, but by <kbd class="mod3n"></kbd><kbd class="mouse">Left</kbd>-dragging
+  to turn it into a push-pull trim instead, there is no overlap, and the end of
+  the earlier region has been moved along with the start of the later region, so
+  that they still directly adjoin each other. In effect, it is like doing a simple
+  trim to reduce the leftmost region, then doing a simple trim to extend the rightmost
+  one to fill the gap.

 </p>
 </p>

-

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

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

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

diff --git a/source/images/after-push-trim.png b/source/images/after-push-trim.png
new file mode 100644 (file)
index 0000000..0163c4b
Binary files /dev/null and b/source/images/after-push-trim.png differ

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

diff --git a/source/images/before-trim.png b/source/images/before-trim.png
new file mode 100644 (file)
index 0000000..1fe965a
Binary files /dev/null and b/source/images/before-trim.png differ