Merge branch 'ricknjacky-timbre' into master

sugarlabs · Nov 12, 2020 · ffbe740 · ffbe740
2 parents 5954e06 + 0ed462f
commit ffbe740
Show file tree

Hide file tree

Showing 14 changed files with 4,810 additions and 5,807 deletions.
diff --git a/guide/README.md b/guide/README.md
@@ -2149,12 +2149,6 @@ The *Timbre* widget has a number of different panels, each of which is
 used to set the parameters of the components that define your custom
 timbre.
 
-From left to right:
-
-![alt
- tag](https://rawgithub.com/sugarlabs/musicblocks/master/guide/timbre2a.svg
- "the play button")
-
 * The *Play* button, which lets you test the sound quality of your
 custom timbre. By default, it will play `Sol`, `Mi`, `Sol` using the
 combination of filters you define.
@@ -2166,10 +2160,6 @@ combination of filters you define.
 You can also put notes in the *Timbre* block to use for testing your
 sound. In the example above, a scale will be used for the test.
 
-![alt
- tag](https://rawgithub.com/sugarlabs/musicblocks/master/guide/timbre2b.svg
- "the save button")
-
 * The *Save* button, which will save your custom timbre for use in
 your program.
 
@@ -2198,6 +2188,9 @@ envelope, with controls for attack, decay, sustain, and release.
 ![alt
  tag](https://rawgithub.com/sugarlabs/musicblocks/master/guide/timbre6.svg
  "select effect")
+![alt
+ tag](https://rawgithub.com/sugarlabs/musicblocks/master/guide/timbre6a.svg
+ "tremolo")
 
 * The *Effects* button, which lets you add effects to your custom
 timbre: tremelo, vibrato, chorus, phaser, and distortion. When an
@@ -2210,31 +2203,11 @@ effect is selected, additional controls will appear in the widget.
 * The *Filter* button, which lets you choose between a number of
 different filter types.
 
-![alt
- tag](https://rawgithub.com/sugarlabs/musicblocks/master/guide/timbre2c.svg
- "the add filter button")
-
 * The *Add filter* button, which lets you add addition filters to your
 custom timbre.
 
-![alt
- tag](https://rawgithub.com/sugarlabs/musicblocks/master/guide/timbre2d.svg
- "the undo button")
-
 * The *Undo* button.
 
-![alt
- tag](https://rawgithub.com/sugarlabs/musicblocks/master/guide/timbre2e.svg
- "the close button")
-
-* The *Close* button.
-
-![alt
- tag](https://rawgithub.com/sugarlabs/musicblocks/master/guide/timbre2f.svg
- "the drag handle")
-
-* The *Drag* handle.
-
 As you add synthesizers, effects, and filters with the widget, blocks
 corresponding to your choices are added to the *Timbre* block. This
 lets you reopen the widget to fine-tune your custom timbre.

diff --git a/guide/timbre2.svg b/guide/timbre2.svg
diff --git a/guide/timbre2a.svg b/guide/timbre2a.svg
diff --git a/guide/timbre2b.svg b/guide/timbre2b.svg
diff --git a/guide/timbre2c.svg b/guide/timbre2c.svg
diff --git a/guide/timbre2d.svg b/guide/timbre2d.svg
diff --git a/guide/timbre2e.svg b/guide/timbre2e.svg
diff --git a/guide/timbre2f.svg b/guide/timbre2f.svg
diff --git a/guide/timbre3.svg b/guide/timbre3.svg
diff --git a/guide/timbre4.svg b/guide/timbre4.svg
diff --git a/guide/timbre5.svg b/guide/timbre5.svg
diff --git a/guide/timbre6.svg b/guide/timbre6.svg
diff --git a/guide/timbre6a.svg b/guide/timbre6a.svg
diff --git a/guide/timbre7.svg b/guide/timbre7.svg