circus: stick: Add more fingering info.

1 files changed, 47 insertions, 48 deletions

diff --git a/03-circus/music/stick.ly b/03-circus/music/stick.ly
index d9638ee..ccd1a06 100644
--- a/03-circus/music/stick.ly
+++ b/03-circus/music/stick.ly
@@ -13,24 +13,24 @@ stickA = \relative c'' {
 
 stickHalfTimeFeel = \relative c' {
   \time 2/4
-  b8 d r b16 d         |
-  fis8-. r8 r4         |
-  r8 b,16 d fis g fis8 |
+  b8\3-1 d\3-3 r b16\3-1 d\3-3 |
+  fis8-.\2-2 r8 r4             |
+  r8 b,16\4-4 d\3-2 fis\2-1 g-2 fis8-1 |
   \time 3/4
-  e16 d cis b d cis c b
-  \tuplet 3/2 { fis8 g b } |
+  e16\3-4 d-2 cis-1 b\4-4 d\3-2 cis-1\glissando b8-1
+  \tuplet 3/2 { fis8\4-2 g\4-3 b\3-2 } |
   \time 2/4
-  ais8 r8. g16 a ais d4 r8*5
-  d,4 dis eis fis r8 |
+  ais8\3-1 r8. g16\4-1 a-2 ais-3 d4\3-2 r8*5
+  d,4\5-2 dis-3 eis\4-1 fis-2 r8 |
 }
 
 stickWeird = \relative c' {
   \repeat volta 2 {
-    \time 5/4 {g4. fis16 g cis8 d r g, fis cis |}
-    \time 9/8 {cis'4. b16 fis a8 b2 | }
+    \time 5/4 {g4.\4-3 fis16-1 g-2 cis8\3-1 d-2 r g,\4-3 fis-2 cis\5-1 |}
+    \time 9/8 {cis'4.\3-3 b16-3 fis\4-2 a8\3-1 b2-3 | }
   } \alternative {
-    {r2 r8 b8 a g fis  |}
-    {r2 r8 b cis d fis |}
+    {r2 r8 b8\3-3 a-1 g\4-3 fis-2 |}
+    {r2 r8 b\3-1 cis-2 d-3 fis\2-2 |}
   }
 }
 
@@ -47,14 +47,13 @@ stickWeirdLeft = \relative c, {
 
 stickDance = \relative c' {
   \time 5/4
-  g'4. fis8 e4 r2
-  fis4. e16 d b4
-  %% TODO
-  \tuplet 3/2 { f8 b d }
-  fis4
+  g'4.\2-3 fis8-2 e4-1 r2
+  fis4.\2-2 e16-1 d\3-3 b4-1
+  \tuplet 3/2 { b8\3-1 cis-2 d-3 }
+  fis4\2-2
 
   \time 3/4
-  e2. | d8 cis ais4 r4
+  e2.\2-1 | d8\3-3 cis-2 ais4-1 r4
 }
 
 %% TODO
@@ -148,26 +147,26 @@ stickBeforeArpeggioLeft = \relative c, {
 
 stickArpeggioLeft = \relative c, {
   \mark \markup { \italic { Sustain throughout }}
-  e8 b' g' ~ g4. |
-  e,8 b' g' ~ g4. |
-  e,4. g'4. | r2. |
+  e8\9-1 b'\10-2 g'\11-3 ~ g4. |
+  e,8\9-1 b'\10-2 g'\11-3 ~ g4. |
+  e,4.\9-1 g'4.\11-3 | r2. |
 
-  d,8_\markup { \musicglyph #"scripts.thumb" \italic { = right hand thumb }} a'
-  fis'\thumb ~ fis4.
-  d,8 a'
-  fis'\thumb ~ fis4.
-  d,2. ~ d2.
+  d,8\8-1_\markup { \musicglyph #"scripts.thumb" \italic { = right hand thumb }} a'\9-2
+  fis'\10-1\thumb ~ fis4.
+  d,8\8-1 a'\9-2
+  fis'\10-1\thumb ~ fis4.
+  d,2.\8-1 ~ d2.
 
   %% repeat, but with more pathos!
-  e8 b' g' ~ g4. |
-  e,8 b' g' ~ g4. |
-  e,8 b' g' ~ g4. |
-  e,8 b' g' ~ g4. |
-
-  d,8 a' fis' ~ fis4.
-  d,8 a' fis' ~ fis4.
-  d,8 a' fis' ~ fis4.
-  d,8 a' fis' ~ fis4.
+  e8\9-1 b'\10-2 g'\11-3 ~ g4. |
+  e,8\9-1 b'\10-2 g'\11-3 ~ g4. |
+  e,8\9-1 b'\10-2 g'\11-3 ~ g4. |
+  e,8\9-1 b'\10-2 g'\11-3 ~ g4. |
+
+  d,8\8-1 a'\9-2 fis'\10-1\thumb ~ fis4.
+  d,8\8-1 a'\9-2 fis'\10-1\thumb ~ fis4.
+  d,8\8-1 a'\9-2 fis'\10-1\thumb ~ fis4.
+  d,8\8-1 a'\9-2 fis'\10-1\thumb ~ fis4.
 }
 
 stickBeforeArpeggioRight = \relative c' {
@@ -177,24 +176,24 @@ stickBeforeArpeggioRight = \relative c' {
 
 stickArpeggioRight = \relative c' {
   \time 3/4
-  r4. d,8 b' fis
-  r4. d8 b' fis
-  d4 b' fis ~ | fis2.
+  r4. d,8\5-3 b'\3-2 fis\4-1
+  r4. d8\5-3 b'\3-2 fis\4-1
+  d4\5-3 b'\3-2 fis\4-1 ~ | fis2.
 
-  r4. d8 b' fis
-  r4. d8 b' fis
+  r4. d8\5-3 b'\3-2 fis\4-1
+  r4. d8\5-3 b'\3-2 fis\4-1
   r2. r2.
 
   %% repeat, but with more pathos!
-  r4. d8 b' fis
-  r4. d8 b' fis
-  r4. d8 b' fis
-  r4. d8 b' fis
-
-  r4. d8 b' fis
-  r4. d8 b' fis
-  r4. d8 b' fis
-  r4. d8 b' fis
+  r4. d8\5-3 b'\3-2 fis\4-1
+  r4. d8\5-3 b'\3-2 fis\4-1
+  r4. d8\5-3 b'\3-2 fis\4-1
+  r4. d8\5-3 b'\3-2 fis\4-1
+
+  r4. d8\5-3 b'\3-2 fis\4-1
+  r4. d8\5-3 b'\3-2 fis\4-1
+  r4. d8\5-3 b'\3-2 fis\4-1
+  r4. d8\5-3 b'\3-2 fis\4-1
 }
 
 stickArpeggioLeftHigher = \relative c, {