song1: stick: Add lots of performance information.

1 files changed, 64 insertions, 51 deletions

diff --git a/01-song1/music/stick.ly b/01-song1/music/stick.ly
index c38a9ec..66f9460 100644
--- a/01-song1/music/stick.ly
+++ b/01-song1/music/stick.ly
@@ -1,23 +1,30 @@
 \include "../stafftab.ly"
 
 stickIntroLeft = \relative c, {
-  r8 b\f cis r \parenthesize <cis' gis'>\pp r <cis gis'>\f cis, |
-  r8 b   cis r \parenthesize <cis' gis'>\pp r <cis gis'>\f cis, |
-  r8 b   cis r \parenthesize <cis' gis'>\pp r <cis gis'>\f r    |
-  e8 b' e, b' dis,8 b' dis, b' |
-
-  r8 b,, cis r \parenthesize <cis' gis'>\pp r <cis gis'>\f cis, |
-  r8 b   cis r \parenthesize <cis' gis'>\pp r <cis gis'>\f cis, |
-  r8 b   cis r \parenthesize <cis' gis'>\pp r <cis gis'>\f r    |
-  <e b'>2 <dis b'> |
+  r8 b-1\8\f cis-4\8 r \parenthesize <cis'-1\10 gis'-1\11>\pp r <cis-1\10 gis'-1\11>\f cis,-4\8 |
+  r8 b-1\8   cis-4\8 r \parenthesize <cis'-1\10 gis'-1\11>\pp r <cis-1\10 gis'-1\11>\f cis,-4\8 |
+  r8 b-1\8   cis-4\8 r \parenthesize <cis'-1\10 gis'-1\11>\pp r <cis-1\10 gis'-1\11>\f r    |
+  e8-1\10 b'-2\11 e,-1\10 b'-2\11 dis,8-1\10 b'-2\11 dis,-1\10 b'-2\11 |
+
+  r8 b,,-1\8 cis-4\8 r \parenthesize <cis'-1\10 gis'-1\11>\pp r <cis-1\10 gis'-1\11>\f cis,-4\8 |
+  r8 b-1\8   cis-4\8 r \parenthesize <cis'-1\10 gis'-1\11>\pp r <cis-1\10 gis'-1\11>\f cis,-4\8 |
+  r8 b-1\8   cis-4\8 r \parenthesize <cis'-1\10 gis'-1\11>\pp r <cis-1\10 gis'-1\11>\f r    |
+  <e-1\10 b'-2\11>2 <dis-1\10 b'-2\11> |
 }
 
 stickIntroRight = \relative c {
-  \repeat unfold 3 { <dis fis b>4 r8 <e gis cis>4 <e gis cis> r8 | }
-  <gis b e>2 <dis fis b> |
-  \repeat unfold 3 { <dis fis b>4 r8 <e gis cis>4 <e gis cis> r8 | }
-  a'8 gis fis e
-  dis16 e dis8 b4
+  \repeat unfold 3 {
+    <dis-3\5 fis-1\4 b-1\3>4 r8
+    <e-3\5 gis-1\4 cis-1\3>4 <e-3\5 gis-1\4 cis-1\3> r8 |
+  }
+  <gis-3\4 b-1\3 e-1\2>2 <dis-3\5 fis-1\4 b-1\3> |
+
+  \repeat unfold 3 {
+    <dis-3\5 fis-1\4 b-1\3>4 r8
+    <e-3\5 gis-1\4 cis-1\3>4 <e-3\5 gis-1\4 cis-1\3> r8 |
+  }
+  gis'16-1\2 a-2\2 gis8-2\2 fis-4\3 e-2\3
+  dis16-1\3 e-2\3 dis-1\3 cis-4\4 b4-2\4
 }
 
 stickALeft = \relative c {
@@ -31,23 +38,23 @@ stickALeft = \relative c {
   \time 2/4
   cis8 r cis r | r4 cis8 r | r4 cis8 r   |
   \time 4/4
-  r2 r4 e'4 ~ | e2 e4-. dis-. |
+  r2 r4 e'4-2\12 ~ | e2-2\12 e4-.-2\12 dis-.-1\12 |
 }
 
 stickARight = \relative c {
   \key cis \minor
   \time 2/4
-  r4 r | <e gis cis>4 r8 <dis fis b> | r <dis fis b> r r |
-  r4 r | <e gis cis>4 r8 <dis fis b> |
+  r4 r | <e-3\5 gis-1\4 cis-1\3>4 r8 <dis-3\5 fis-1\4 b-1\3> | r <dis-3\5 fis-1\4 b-1\3> r r |
+  r4 r | <e-3\5 gis-1\4 cis-1\3>4 r8 <dis-3\5 fis-1\4 b-1\3> |
   \time 6/8
-  r <dis fis b> r <e gis cis> r r|
+  r <dis-3\5 fis-1\4 b-1\3> r <e-3\5 gis-1\4 cis-1\3> r r|
 
   \time 2/4
-  r4 r | <e gis cis>4 r8 <dis fis b> | r <dis fis b> r r |
+  r4 r | <e-3\5 gis-1\4 cis-1\3>4 r8 <dis-3\5 fis-1\4 b-1\3> | r <dis-3\5 fis-1\4 b-1\3> r r |
   \time 4/4
-  cis'8-2 gis-1 e-3
-  \change Staff = "stick left" dis'-1 \change Staff = "stick right" c-2 fis,-1
-  cis'4-2 ~ | cis2 cis4-.-2 c-.-1 |
+  cis'8-2\3 gis-1\4 e-3\5
+  \change Staff = "stick left" dis'-1\12 \change Staff = "stick right" c-2\3 fis,-1\4
+  cis'4-2\3 ~ | cis2-2\3 cis4-.-2\3 c-.-1\3 |
 }
 
 stickAExtendedLeft = \relative c' {
@@ -56,47 +63,49 @@ stickAExtendedLeft = \relative c' {
   %% hand line.
   r1 | r1 |
 
-  r2 r4 e4 ~ | e2 e4-. dis-. |
+  r2 r4 e4-2\12 ~ | e2-2\12 e4-.-2\12 dis-.-1\12 |
   r1 | r1 |
 }
 
 stickAExtendedRight = \relative c' {
   \time 4/4
-  e8-1 cis-3 \change Staff = "stick left" gis-1
+  e8-1\2 cis-3\3 \change Staff = "stick left" gis-1\11
   \change Staff = "stick right"
-  fis'-2 c-1 \change Staff = "stick left" a-2
+  fis'-2\2 c-1\3 \change Staff = "stick left" a-2\11
   \change Staff = "stick right"
-  <e' gis>4 ~ | <e gis>4.
+  <e'-3\3 gis-2\2>4 ~ | q4.
 
   \change Staff = "stick left"
-  e8-2
+  e8-2\12
   \change Staff = "stick right"
-  fis-2
+  fis-2\2
   \change Staff = "stick left"
-  dis-1
+  dis-1\12
   \change Staff = "stick right"
-  c-1
+  c-1\3
   \change Staff = "stick left"
-  e-2 |
+  e-2\12 |
   \change Staff = "stick right"
 
-  cis8-2 gis-1 e-3
-  \change Staff = "stick left" dis'-1 \change Staff = "stick right" c-2 fis,-1
-  cis'4-2 ~ | cis2 cis4-.-2 c-.-1 |
+  %% TODO: this is copied from elsewhere: merge!
+  cis8-2\3 gis-1\4 e-3\5
+  \change Staff = "stick left" dis'-1\12 \change Staff = "stick right" c-2\3 fis,-1\4
+  cis'4-2\3 ~ | cis2-2\3 cis4-.-2\3 c-.-1\3 |
 
-  e8-1 cis-3 \change Staff = "stick left" gis-1
+  %% TODO: almost identical to the beginning of this segment
+  e8-1\2 cis-3\3 \change Staff = "stick left" gis-1\11
   \change Staff = "stick right"
-  fis'-2 c-1 \change Staff = "stick left" a-2
+  fis'-2\2 c-1\3 \change Staff = "stick left" a-2\11
   \change Staff = "stick right"
-  <e' gis>4 ~ | <e gis>2 r8 fis gis a |
+  <e'-3\3 gis-2\2>4 ~ | q2 r8 fis gis a |
 }
 
 stickATransitionLeft = \relative c {
   \time 4/4 r1 | r1 | r1 |
 }
 stickATransitionRight = \relative c' {
-  b'8 gis e fis gis e <e a cis>4\arpeggio ~ | <e a cis>1 ~
-  \time 4/4 <e a cis>1 |
+  b'8-1\1 gis-2\2 e-3\3 fis-1\2 gis-2\2 e-3\3 <e-3\3 a-2\2 cis-1\1>4\arpeggio ~ |
+  <e-3\3 a-2\2 cis-1\1>1 ~ | <e-3\3 a-2\2 cis-1\1>1 |
 }
 
 stickATransitionVariantLeft = \relative c {
@@ -105,9 +114,11 @@ stickATransitionVariantLeft = \relative c {
 
 stickATransitionVariantRight = \relative c' {
   \time 4/4 \repeat unfold 4 {
-    cis8-2 gis-1 e-3 e' c4-.-1 cis4-.-2
+    cis8-2\3 gis-1\4 e-3\5
+    e' % bass side, -3\12
+    c4-.-1\3 cis4-.-2\3
   }
-  <e gis cis>8-. r r q-. r r r r | r q4. r2 |
+  <e-3\5 gis-1\4 cis-2\3>8-. r r q-. r r r r | r q4. r2 |
 }
 
 stickATransitionVariantPreOutroLeft = \relative c {
@@ -117,20 +128,22 @@ stickATransitionVariantPreOutroLeft = \relative c {
 stickATransitionVariantPreOutroRight = \relative c' {
   \tempo 4 = 195
   \time 4/4 \repeat unfold 3 {
-    cis8-2 gis-1 e-3 e' c4-.-1 cis4-.-2
+    cis8-2\3 gis-1\4 e-3\5
+    e' % bass side, -3\12
+    c4-.-1\3 cis4-.-2\3
   }
-  <cis gis>1 |
+  <cis-1\4 gis-1\3>1 |
 }
 
 stickVerseLeft = \relative c {
   \time 4/4
   \key cis \minor
-  cis4\sustainOn gis' e' cis, ~ cis gis' e' r\sustainOff |
-  e,,\sustainOn b' gis' b, ~ b fis' dis' b,\sustainOff |
-  cis4\sustainOn gis' e' cis, ~ cis gis' e' r\sustainOff |
-  e,,\sustainOn b' gis'\sustainOff b,\sustainOn ~ b fis' dis' b,\sustainOff |
-  a,2. <a' e' b'>4 ~ | <a e' b'>1 |
-  a,4. <a' e' b'> b,4 ~ | b1 |
+  cis4-1\10\sustainOn gis'-2\11 e'-3\12 cis,-1\10 ~ cis gis'-2\11 e'-3\12 r\sustainOff |
+  e,,-1\9\sustainOn b'-2\10 gis'-4\11\sustainOff b,-1\10\sustainOn ~ b fis'-2\11 dis'-4\12 b,-1\10\sustainOff |
+  cis4-1\10\sustainOn gis'-2\11 e'-3\12 cis,-1\10 ~ cis gis'-2\11 e'-3\12 r\sustainOff |
+  e,,-1\9\sustainOn b'-2\10 gis'-4\11\sustainOff b,-1\10\sustainOn ~ b fis'-2\11 dis'-4\12 b,-1\10\sustainOff |
+  a,4-.-3\8 a-.-1\8 a-.-3\8 <a'-1\10 e'-1\11 b'-1\12>4 ~ | q1 |
+  <a-1\10 e'-1\11 b'-1\12>4. cis-4\10 <b-1\10 fis'-1\11 cis'-1\12>4 ~ | q1 |
 }
 
 % TODO
@@ -286,9 +299,9 @@ stickOutroLeft = \relative c, {
 
 stickOutroRight = \relative c' {
   \repeat unfold 3 { <cis e>8 r r r <gis cis> r q r | }
-  <gis b e>2 <dis fis b> |
+  <gis b e>2 <dis-3\5 fis-1\4 b-1\3> |
   \repeat unfold 3 { <cis e>8 r r r <gis cis> r q r | }
-  <gis b e>2 <dis fis b> |
+  <gis b e>2 <dis-3\5 fis-1\4 b-1\3> |
 }
 
 stickEndLeft = {}