X-Git-Url: https://git.elephly.net/?p=music%2Fpretentious.git;a=blobdiff_plain;f=01-song1%2Fmusic%2Fbass.ly;h=0e526fc15dda542118a2b4db1b3bc776c01b1eb7;hp=f9a9047bf25e74aa5fec855727617a0c50c4d822;hb=00b8024894a70b1e080b80e54d9ddc2caf650d37;hpb=6b97c24a76b86145204892f651d57cc51d2f7bee

diff --git a/01-song1/music/bass.ly b/01-song1/music/bass.ly
index f9a9047..0e526fc 100644
--- a/01-song1/music/bass.ly
+++ b/01-song1/music/bass.ly
@@ -32,22 +32,27 @@ bassAExtended = \relative fis,, {
   cis'8 cis cis c c c cis4 ~ | cis2 r4 r4 |
 
   cis8  cis cis c c c cis4 ~ | cis2 r4 r4 |
-  cis8  cis cis c c c cis4 ~ | cis4 cis8 cis cis cis cis cis |
+  cis8  cis cis c c c cis4 ~ | cis4-. cis4-. cis4-. cis4-. |
 }
 
 bassATransition = \relative fis,, {
   \time 4/4
-  e8 e e e fis gis a4 ~ | a1 ~ | a1 ~ | a |
+  e4. fis4 gis8 a4 ~ | a1 ~ | a1 |
 }
 
 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 |
 }
 
+bassATransitionVariantPreOutro = \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,1 |
+}
+
 bassVerse = \relative fis, {
   \time 4/4
   \key cis \minor
@@ -142,30 +147,11 @@ bassWaltz = \relative c, {
   c4. c c4 |
 }
 
-%% TODO
-bassB = \relative c, {
-  \key cis \minor
-  \time 2/4
-  cis4 cis, | cis'4 r8 b | r b r cis, |
-  cis4 cis | cis'4 r8 b |
-  \time 6/8
-  r b r cis r r|
-
-  \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 |
-}
-
-bassBTransition = \relative c,, {
-  \time 4/4 e4. dis cis4 ~ | cis8 dis4. e4 dis4 |
-}
-
 bassEnd = \relative fis, {
   \time 4/4
-  \repeat unfold 3 { cis8 b r b cis r cis r |}
+  \repeat unfold 3 { cis8 cis cis cis cis cis cis cis |}
   e e e e b b b b |
-  \repeat unfold 3 { cis8 b r b cis r cis r |}
+  \repeat unfold 3 { cis8 cis cis cis cis cis cis cis |}
   e e e e fis fis fis gis |
 }
 
@@ -182,7 +168,7 @@ bassMusic = {
   \bassAExtended
   \bassATransition
 
-  \repeat volta 2 \bassVerse
+  \repeat volta 3 \bassVerse
   \bassVerseVariant
   \bassVerseHarder
 
@@ -194,8 +180,9 @@ bassMusic = {
   \bassNasty
   \bassWaltz
 
-  \repeat volta 2 \bassB
-  \bassBTransition
+  \repeat volta 2 \bassA
+  \bassAExtended
+  \bassATransitionVariantPreOutro
   \repeat volta 2 \bassEnd
 }