From 6b97c24a76b86145204892f651d57cc51d2f7bee Mon Sep 17 00:00:00 2001
From: rekado <rekado@elephly.net>
Date: Wed, 5 Oct 2016 22:39:01 +0200
Subject: song1: Add transition variant.

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

(limited to '01-song1')

diff --git a/01-song1/music/bass.ly b/01-song1/music/bass.ly
index 77b7e0a..f9a9047 100644
--- a/01-song1/music/bass.ly
+++ b/01-song1/music/bass.ly
@@ -33,13 +33,19 @@ bassAExtended = \relative fis,, {
 
   cis8  cis cis c c c cis4 ~ | cis2 r4 r4 |
   cis8  cis cis c c c cis4 ~ | cis4 cis8 cis cis cis cis cis |
-
-  %% TODO
-  e,8 e e e fis gis a4 ~ | a1 ~ |
 }
 
 bassATransition = \relative fis,, {
-  \time 4/4 a1 ~ | a |
+  \time 4/4
+  e8 e e e fis gis a4 ~ | a1 ~ | a1 ~ | a |
+}
+
+bassATransitionVariant = \relative fis,, {
+  \time 4/4
+  cis8  r r cis8 e'4 dis | cis,8 r r e'8 c4 cis |
+  cis,8 r r cis8 e'4 dis | cis,8 r r e'8 c4 cis |
+  cis,8 r r cis8 e'4 dis |
+  cis8-. r r cis-. r r r r | r cis,4. r2 |
 }
 
 bassVerse = \relative fis, {
@@ -182,7 +188,7 @@ bassMusic = {
 
   \repeat volta 2 \bassA
   \bassAExtended
-  \bassATransition
+  \bassATransitionVariant
 
   \nastyPause
   \bassNasty
diff --git a/01-song1/music/keys.ly b/01-song1/music/keys.ly
index 47f837c..60c1ee9 100644
--- a/01-song1/music/keys.ly
+++ b/01-song1/music/keys.ly
@@ -22,12 +22,18 @@ keysAExtended = \relative c' {
 
   cis8 e gis  c, dis fis cis4 ~ | cis2 r |
   cis8  e gis  c, dis fis cis4 ~ | cis2 r |
+}
 
-  gis'8 e b  dis e b <a cis e>4\arpeggio ~ | <a cis e>1 |
+keysATransition = \relative c' {
+  \time 4/4
+  gis'8 e b  dis e b <a cis e>4\arpeggio ~ | <a cis e>1 ~ |
+  <a cis e> ~ | <a cis e> |
 }
 
-keysATransition = {
-  \time 4/4 R1 | R1 |
+keysATransitionVariant = \relative c' {
+  \time 4/4
+  \repeat unfold 5 { cis8 gis e e' c4-. cis4-. | }
+  <e gis c>8-. r r q-. r r r r | r q4. r2 |
 }
 
 keysVerse = \relative c {
@@ -158,7 +164,7 @@ keyboard = <<
 
     \repeat volta 2 \keysA
     \keysAExtended
-    \keysATransition
+    \keysATransitionVariant
 
     \nastyPause
     \keysNasty
diff --git a/01-song1/music/stick.ly b/01-song1/music/stick.ly
index 9c49bd2..294f9b6 100644
--- a/01-song1/music/stick.ly
+++ b/01-song1/music/stick.ly
@@ -56,8 +56,6 @@ stickAExtendedLeft = \relative c' {
 
   r2 r4 e4 ~ | e2 e4-. dis-. |
   r1 | r1 |
-
-  r1 | r1 |
 }
 
 stickAExtendedRight = \relative c' {
@@ -89,17 +87,27 @@ stickAExtendedRight = \relative c' {
   fis'-2 c-1 \change Staff = "stick left" a-2
   \change Staff = "stick right"
   <e' gis>4 ~ | <e gis>2 r8 fis gis a |
-
-  b8 gis e fis gis e <e a cis>4\arpeggio ~ | <e a cis>1 ~
 }
 
 stickATransitionLeft = \relative c {
-  \time 4/4 r1 | r1 |
+  \time 4/4 r1 | r1 | r1 | r1 |
 }
 stickATransitionRight = \relative c' {
+  b8 gis e fis gis e <e a cis>4\arpeggio ~ | <e a cis>1 ~
   \time 4/4 <e a cis>1 ~ | <e a cis> |
 }
 
+stickATransitionVariantLeft = \relative c {
+  \time 4/4 r1 | r1 | r1 | r1 | r1 | r1 | r1 |
+}
+
+stickATransitionVariantRight = \relative c' {
+  \time 4/4 \repeat unfold 5 {
+    cis8-2 gis-1 e-3 e' c4-.-1 cis4-.-2
+  }
+  <e gis cis>8-. r r q-. r r r r | r q4. r2 |
+}
+
 stickVerseLeft = \relative c {
   \time 4/4
   \key cis \minor
@@ -313,7 +321,7 @@ stick = <<
 
     \repeat volta 2 \stickARight
     \stickAExtendedRight
-    \stickATransitionRight
+    \stickATransitionVariantRight
 
     \nastyPause
     \stickNastyRight
@@ -343,7 +351,7 @@ stick = <<
 
     \repeat volta 2 \stickALeft
     \stickAExtendedLeft
-    \stickATransitionLeft
+    \stickATransitionVariantLeft
 
     \nastyPause
     \stickNastyLeft
-- 
cgit v1.2.3