From e1046ce90d541cc614c2408001f3548872a2354b Mon Sep 17 00:00:00 2001
From: rekado <rekado@elephly.net>
Date: Wed, 5 Oct 2016 20:36:02 +0200
Subject: song1: Change "A" section.

---
 01-song1/music/bass.ly  |  2 +-
 01-song1/music/keys.ly  | 12 ++++++------
 01-song1/music/stick.ly | 16 +++++++++-------
 3 files changed, 16 insertions(+), 14 deletions(-)

(limited to '01-song1')

diff --git a/01-song1/music/bass.ly b/01-song1/music/bass.ly
index 3d67d23..271e2df 100644
--- a/01-song1/music/bass.ly
+++ b/01-song1/music/bass.ly
@@ -24,7 +24,7 @@ bassA = \relative fis,, {
   \time 2/4
   cis,4 cis | cis'4 r8 b | r b r r |
   \time 4/4
-  cis,4. dis e4 ~ | e8 fis4. e4 dis |
+  cis8 cis cis c c c cis4 ~ | cis2 r4 r4 |
 }
 
 bassAExtended = \relative fis,, {
diff --git a/01-song1/music/keys.ly b/01-song1/music/keys.ly
index a88db68..3915e42 100644
--- a/01-song1/music/keys.ly
+++ b/01-song1/music/keys.ly
@@ -2,18 +2,18 @@ keysIntro = {
   \repeat unfold 16 R1 |
 }
 
-keysA = \relative c' {
+keysA = \relative c'' {
   \key cis \minor
   \time 2/4
-  r4 r | <e gis>4 r8 <dis fis> | r <dis fis> r r |
-  r4 r | <e gis>4 r8 <dis fis> |
+  r4 r | gis8 e cis fis-. | r dis r4 |
+  r4 r | gis8 e cis <dis fis>-. |
   \time 6/8
-  r <dis fis> r <e gis> r r|
+  r8 <dis fis> r <cis e gis> r r|
 
   \time 2/4
-  r4 r | <e gis>4 r8 <dis fis> | r <dis fis> r r |
+  r4 r | gis'8 e cis fis-. | r dis r4 |
   \time 4/4
-  <cis e>4. <dis fis> <e gis>4 ~ | <e gis>8 <fis a>4. <e gis>4 <dis fis> |
+  cis8 e gis  c, dis fis cis4 ~ | cis2 r |
 }
 
 keysAExtended = \relative c' {
diff --git a/01-song1/music/stick.ly b/01-song1/music/stick.ly
index 82b0499..8fe2acf 100644
--- a/01-song1/music/stick.ly
+++ b/01-song1/music/stick.ly
@@ -29,21 +29,23 @@ stickALeft = \relative c' {
   \time 2/4
   cis8 r cis r | r r cis r | r r cis r   |
   \time 4/4
-  r8 r cis r  r cis r r | cis r r cis  r cis r cis |
+  r8 r r  r r r e4 ~ | e2 e4-. dis-. |
 }
 
-stickARight = \relative c' {
+stickARight = \relative c {
   \key cis \minor
   \time 2/4
-  r4 r | <e gis>4 r8 <dis fis> | r <dis fis> r r |
-  r4 r | <e gis>4 r8 <dis fis> |
+  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> |
   \time 6/8
-  r <dis fis> r <e gis> r r|
+  r <dis fis b> r <e gis cis> r r|
 
   \time 2/4
-  r4 r | <e gis>4 r8 <dis fis> | r <dis fis> r r |
+  r4 r | <e gis cis>4 r8 <dis fis b> | r <dis fis b> r r |
   \time 4/4
-  <cis e>4. <dis fis> <e gis>4 ~ | <e gis>8 <fis a>4. <e gis>4 <dis fis> |
+  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 |
 }
 
 stickAExtendedLeft = \relative c {
-- 
cgit v1.2.3