song2: stick: Alternate hands more often.

1 files changed, 28 insertions, 28 deletions

diff --git a/02-song2/music/stick.ly b/02-song2/music/stick.ly
index 098a5ab..3d83313 100644
--- a/02-song2/music/stick.ly
+++ b/02-song2/music/stick.ly
@@ -167,40 +167,40 @@ stickFinalRight = \relative c' {
   b'16 a fis dis
   b' fis dis fis
   dis b fis b
-  fis dis b fis
+  fis dis b
 
   %% alternate right and left hand
+  \change Staff = "stick left" fis-1
   \tuplet 6/4 {
-    d''
-    \change Staff = "stick left"  a
-    \change Staff = "stick right" fis
-    \change Staff = "stick left"  a
-    \change Staff = "stick right" fis
-    \change Staff = "stick left"  d
+    \change Staff = "stick right" d''\2-1  % fret: 7
+    \change Staff = "stick left"  a\11-2   % fret: 5
+    \change Staff = "stick right" fis\4-3  % fret: 9
+    \change Staff = "stick left"  a\11-2
+    \change Staff = "stick right" fis\4-2
+    \change Staff = "stick left"  d\10-1   % fret: 5
   }
   \tuplet 6/4 {
-    \change Staff = "stick right" fis
-    \change Staff = "stick left"  d
-    \change Staff = "stick right" a
-    \change Staff = "stick left" d
-    \change Staff = "stick right" a
-    \change Staff = "stick left" e'
+    \change Staff = "stick right" fis\4-1
+    \change Staff = "stick left"  d\10-1
+    \change Staff = "stick right" a\6-3
+    \change Staff = "stick left"  d\10-1
+    \change Staff = "stick right" a\6-3
+    \change Staff = "stick left"  e'\10-3
   }
-
-  %% |--X--|--X--|-----|-----|-----|-------
-  %% |-----|--X--|-----|--X--|-----|-------
-  %% |-----|-----|-----|--X--|-----|-------
-  %% |-----|--X--|-----|-----|--X--|-------
-  %% |-----|-----|-----|-----|-----|-------
-  %% |-----|-----|-----|-----|-----|-------
-  %%   9     10    11    12    13
-  %%
-  %% fret+string-finger
-  %% 10+4-1 13+4-3 12+3-2  13+4-3 12+3-2 10+2-1
-  \change Staff = "stick right"
-  \tuplet 6/4 { fis a cis  a cis e }
-  \tuplet 3/2 { cis e fis }
-  gis16 a |
+  \tuplet 6/4 {
+    \change Staff = "stick right" fis\4-1
+    \change Staff = "stick left"  a\10-1
+    \change Staff = "stick right" cis\3-3
+    \change Staff = "stick left"  a\10-1
+    \change Staff = "stick right" cis\3-3
+    \change Staff = "stick left"  e\11-2
+  }
+  \tuplet 3/2 {
+    \change Staff = "stick right" cis\3-3
+    \change Staff = "stick left"  e\11-2
+    \change Staff = "stick right" fis\2-3
+  }
+  gis16\1-2 a\1-2 |
 
   b16 a fis dis b' fis dis fis
   dis b fis b fis dis b fis