summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2017-02-23 20:41:02 +0100
committerRicardo Wurmus <rekado@elephly.net>2017-02-23 20:47:41 +0100
commit930d1c93902523c67945602d26fbec1dd43c5cbd (patch)
tree2826396bc5feafb0841b654919ad4a0394ef008b
parentb1969086fb1b0b83a71f0ba99181dcea55cb9ad1 (diff)
song 2: bass: Use more volta repeats.
-rw-r--r--02-song2/music/bass.ly38
1 files changed, 15 insertions, 23 deletions
diff --git a/02-song2/music/bass.ly b/02-song2/music/bass.ly
index 4d929b3..bd35ee1 100644
--- a/02-song2/music/bass.ly
+++ b/02-song2/music/bass.ly
@@ -1,5 +1,5 @@
bassA = \relative c {
- \repeat unfold 2 {
+ \repeat volta 2 {
b,8\fff a16 b8 a16 b4 r8 e,16 fis a8 |
b a16 b8 a16 b4 r8
\ottava #1 d''4\flageolet \ottava #0 |
@@ -18,18 +18,12 @@ bassB = \relative c {
}
bassTransition = \relative fis,, {
- \repeat volta 2 {
- fis16 r8. fis16 r8 e16 fis fis fis8 r4 |
- fis16 r8. fis16 r8 e16 fis fis e fis8 r8. |
+ \repeat volta 4 {
fis16 r8. fis16 r8 e16 fis fis fis8 r4 |
fis16 r8. fis16 r8 e16 fis fis e fis8 r8. |
}
- \repeat volta 2 {
- r16 fis8 e16 fis8 e16 fis8 fis8 r16 r4 |
- r16 fis8 e16 fis8 e16 fis16 r16 fis16 e4 r8 |
- }
- \repeat volta 2 {
+ \repeat volta 4 {
r16 fis8 e16 fis8 e16 fis8 fis8 r16 r4 |
r16 fis8 e16 fis8 e16 fis16 r16 fis16 e4 r8 |
}
@@ -93,15 +87,12 @@ bassMartaRekado = \relative fis,, {
bassReprise = \relative fis,, {
\time 4/4
- fis1 |
- f'8. cis8 a16 fis'4. fis,8 a16 gis |
- fis4. b4 a8 gis fis |
- d' a e' fis fis, fis fis fis |
-
- fis1 |
- f'8. cis8 a16 fis'4. fis,8 a16 gis |
- fis4. b4 a8 gis fis |
- d' a e' fis fis, fis fis fis |
+ \repeat volta 2 {
+ fis1 |
+ f'8. cis8 a16 fis'4. fis,8 a16 gis |
+ fis4. b4 a8 gis fis |
+ d' a e' fis fis, fis fis fis |
+ }
%% TODO: simplify
fis fis16 fis fis8 fis16 fis fis fis fis8 fis e' |
@@ -120,11 +111,12 @@ bassFinal = \relative fis,, {
d8. d8 e16 fis,2 r8 |
}
- 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 |
+ \repeat volta 2 {
+ b16 r8 b16 r16 b b'4. b,16 a' b cis, |
+ } \alternative {
+ { d8 d d d16 a8. a8 a ais |}
+ { f'8 f' r8 f,16 c gis2 ~ | gis1 |}
+ }
}
bassMusic = {