midi mappings, notation tweaks

awake.ly

@@ -154,7 +154,7 @@ guitarTwo = \relative c, {
   % post-chorus thing
   \repeat unfold 2 \mainFifthRiff
   <fs,, cs'>8 <g d'> <e b'> <fs cs'> ~ q <g d'> <e b'> <fs cs'> ~ |
-  q <g d'> <e b'> <c' f c' f> ~ q2 |
+  q <g d'> e <c' f c' f> ~ q2 |
   \repeat unfold 2 \mainFifthRiff
   cs8 b a e ~ e8 fs g4 |
   fs16 g as b cs d e fs g as b cs d e fs8 | g1 \bar "||" |
@@ -164,8 +164,8 @@ guitarTwo = \relative c, {
   % verse 3
   \repeat unfold 2 {
     b,,8 b16 b b( a) b8 r8 b16( a) b( a8.) |
-    e'8 e16 e e( ds) b8 r8 b16( a) b8 r8 |
-    a8 a16 a e'( fs) e8 r8 e e16( fs) a( b) |
+    e'8 e16 e e( ds) b8 r8 b16( a) b4 |
+    a8 a16 a e'\glissando( fs) e8 r8 e e16( fs) a( b) |
     <e, cs'>8. <e a>16 ~ q8 <e b'> ~ q4 b'16( a) a,8 |
   }
 
@@ -468,20 +468,13 @@ guitarOne = \relative c'' {
       { \repeat unfold 2 { r2 r4 ds16( e ds) b | } }
     >>
     <<
-        { r2 r4 a'16( b cs b) | } \\
-        { r2 r4 cs,16( d e d) | }
-      >>
+      { r2 r4 a'16( b cs b) | } \\
+      { r2 r4 cs,16( d e d) | }
+    >>
   }
   \alternative {
-    {
-      <<
-        { r2 r4 \times 4/6 { fs'16( e d) cs16( b a) } | } \\
-        { r2 r4 \times 4/6 { a16( gs fs) e16( d cs) } | }
-      >>
-    }
-    {
-      r4 \tuplet 6/4 4 { g16( a b) cs( d e) fs( g a) b( cs b) a( g fs) e( d cs) } |
-    }
+    { r2 r4 \times 4/6 { a16( gs fs) e16( d cs) } | }
+    { r4 \tuplet 6/4 4 { g16( a b) cs( d e) fs( g a) b( cs b) a( g fs) e( d cs) } | }
   }
 
   \repeat volta 2 {
@@ -744,7 +737,7 @@ chorusVocals = \lyricmode {
   I ne -- ver __ see you.
 
   Sun in __ my eyes, __
-  wash -- es a -- way __ the pain. __
+  wash -- ing a -- way __ the pain. __
   A -- wake __ to -- day, __
   to -- mor -- row __ the dark -- ness __ will fade back __ to light. __
 }