song2: stick: Simplify notation.

diff --git a/02-song2/music/stick.ly b/02-song2/music/stick.ly
index 4493872..d67ab8e 100644 (file)
--- a/02-song2/music/stick.ly
+++ b/02-song2/music/stick.ly
@@ -1,14 +1,14 @@
 stickIntroLeft = \relative c {
   \repeat unfold 2 {
-    <b a' d>8 r16 <b a' d>8 r16
-    <b gis' d'>4 b8 ~ <b gis' d'> b |
-    <b g' d'>8 r16 <b g' d'>8 r16
-    <b fis' d'>4 b8 ~ <b fis' d'>4  |
-
-    <b a' d>8 r16 <b a' d>8 r16
-    <b gis' d'>4 b8 ~ <b gis' d'> b |
-    <b g' d'>8 r16 <b g' d'>8 r16
-    <b fis' d'>8 ~ <b fis' d'>2     |
+    <b a' d>8 r16 q8 r16
+    <b gis' d'>4 b8 ~ q b |
+    <b g' d'>8 r16 q8 r16
+    <b fis' d'>4 b8 ~ q4  |
+
+    <b a' d>8 r16 q8 r16
+    <b gis' d'>4 b8 ~ q b |
+    <b g' d'>8 r16 q8 r16
+    <b fis' d'>8 ~ q2     |
   }
 }
 
@@ -26,15 +26,15 @@ stickIntroRight = \relative c' {
 
 stickStanzaLeft = \relative c {
   \repeat unfold 2 {
-    <b fis'>8 r16 <b fis'>8 r16
-    <b fis'>4 <b fis'>8 r <b fis'>  |
-    <b g'>8 r16 <b g'>8 r16
-    <b fis'>4 <b fis'>8 ~ <b fis'>4 |
+    <b fis'>8 r16 q8 r16
+    <b fis'>4 q8 r q  |
+    <b g'>8 r16 q8 r16
+    <b fis'>4 q8 ~ q4 |
 
-    <b fis'>8 r16 <b fis'>8 r16
-    <e b>4 <e b>8 r <e b> |
+    <b fis'>8 r16 q8 r16
+    <e b>4 q8 r q |
   } \alternative {
-    { <b g'>8 r16 <b g'>8 r16  <b fis'>2 r8 |}
+    { <b g'>8 r16 q8 r16  <b fis'>2 r8 |}
     { <b g' d'>8 r16 <a e'>8 r16 <d, a'>8 ~ <d a'>2 |}
   }
 }