From 6626c1a6381981cded290a857b339ba2b9632170 Mon Sep 17 00:00:00 2001
From: rekado <rekado@elephly.net>
Date: Tue, 10 Nov 2015 21:27:07 +0100
Subject: song2: bass: Add marta-rekado section, transpose.

---
 02-song2/parts/bass.ly | 44 ++++++++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 12 deletions(-)

(limited to '02-song2')

diff --git a/02-song2/parts/bass.ly b/02-song2/parts/bass.ly
index c01196a..b690be9 100644
--- a/02-song2/parts/bass.ly
+++ b/02-song2/parts/bass.ly
@@ -58,7 +58,28 @@ bassThree = \relative fis,, {
   r16 cis8 cis r16 cis8 cis a16 b fis8 |
 }
 
-bassReprise = \relative fis,, {
+%% TODO: boring.
+bassMartaRekado = \relative fis,, {
+  \repeat unfold 2 {
+    \time 5/8
+    fis16 fis8 fis fis fis fis16 |
+    \time 7/8
+    fis8 fis fis fis16 fis8 fis fis fis16 |
+  } \alternative {
+    { \time 5/8 fis8. r16 b a gis a fis r |}
+    { \time 5/8 fis8. r16 b a gis a fis r |}
+  }
+
+  \time 3/4
+  d8. d8 d16     e8. e8 e16    |
+  r16 d r d r d  e8. e16 fis e |
+  fis16 fis8 fis fis16  fis fis8 fis fis16 |
+  \time 7/8
+  fis fis8 fis d' d r r8. |
+}
+
+%% TODO: remove transposition
+bassReprise = \transpose c d { \relative fis,, {
   \time 4/4
   e1 | dis'8. b8 g16 e'4. e,8 g16 fis  |
   e4. a4 g8 fis e | c' g d' e e, e e e |
@@ -68,21 +89,21 @@ bassReprise = \relative fis,, {
   dis8. b8 g16 e'4 e,16 e g' e, a' b   |
   e,,8 e16 e e8 a16 a a a a8 a16 a a a |
   c c, c c' c, c e' e, e e e e e e e e |
-}
+}}
 
 bassFinal = \relative fis,, {
   \time 4/4
   \repeat volta 4 {
-    e8. e16 r8*4 r16 e16 d' e |
-    dis8. b8 c16 e,2 d'16 e   |
-    e,8. e16 r8*5 a16 b c8. c8 d16 e,2 r8 |
+    fis8. fis16 r8*4 r16 fis16 e' fis |
+    f8. cis8 d16 fis,2 e'16 fis       |
+    fis,8. fis16 r8*5 b16 cis d8. d8 e16 fis,2 r8 |
   }
 
-  a16 r8 a16 r16 a a'4. a,16 g' a b, |
-  c8 c c c16 g8. g8 g gis            |
-  a16 r8 a16 r16 a a'4. a,16 g' a b, |
-  dis8 dis' r8 dis,16 ais fis2 ~     |
-  fis1 |
+  b16 r8 b16 r16 b b'4. b,16 a' b cis, |
+  d8 d d d16 a8. a8 a ais              |
+  b16 r8 b16 r16 b b'4. b,16 a' b cis, |
+  f8 f' r8 f,16 c gis2 ~               |
+  gis1 |
 }
 
 bass = {
@@ -108,9 +129,8 @@ bass = {
   \bassTransition
   \bassThree
 
-  %% TODO: add marta rekado section!
+  \bassMartaRekado
 
-  %% TODO: wrong key
   \bassReprise
   \bassFinal
 }
-- 
cgit v1.2.3