summaryrefslogtreecommitdiff
path: root/01-song1
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2017-02-27 19:58:23 +0100
committerRicardo Wurmus <rekado@elephly.net>2017-02-27 19:58:23 +0100
commitd01962547b2d1d022a91248667cc9b635bb76007 (patch)
tree35735f4200524d8326be13f8c242b612eb013e08 /01-song1
parented2e6caa728e6941244d58f614c5f1b83a8895d9 (diff)
song 1: keys: Add repeat numbers.
Diffstat (limited to '01-song1')
-rw-r--r--01-song1/music/keys.ly28
1 files changed, 14 insertions, 14 deletions
diff --git a/01-song1/music/keys.ly b/01-song1/music/keys.ly
index 210bc32..c48eee1 100644
--- a/01-song1/music/keys.ly
+++ b/01-song1/music/keys.ly
@@ -16,10 +16,9 @@ keysA = \relative c'' {
keysAExtended = \relative c' {
\time 4/4
- cis8 e gis c, dis fis cis4 ~ | cis2 r |
-
- cis8 e gis c, dis fis cis4 ~ | cis2 r |
- cis8 e gis c, dis fis cis4 ~ | cis2 r |
+ \repeat volta 3 {
+ cis8 e gis c, dis fis cis4 ~ | cis2 r |
+ } \mark \markup {"3x"}
}
keysATransition = \relative c' {
@@ -30,13 +29,13 @@ keysATransition = \relative c' {
keysATransitionVariant = \relative c' {
\time 4/4
- \repeat volta 4 { cis'8 gis e e' c4-. cis4-. | }
+ \repeat volta 4 { cis'8 gis e e' c4-. cis4-. | } \mark \markup {"4x"}
<e, gis c>8-. r r q-. r r r r | r q4. r2 |
}
keysATransitionPreOutro = \relative c' {
\time 4/4
- \repeat volta 3 { cis'8 gis e e' c4-. cis4-. | }
+ \repeat volta 3 { cis'8 gis e e' c4-. cis4-. | } \mark \markup {"3x"}
r1 |
}
@@ -79,7 +78,7 @@ keysNasty = \relative c' {
<a bis dis>2. | <fis a bis dis> |
<e gis cis> ~ | <e gis cis> ~ |
<e gis cis> ~ | <e gis cis> |
- }
+ } \mark \markup {"3x"}
<gis cis e>2. ~ | <gis cis e> |
<a bis dis> | <a bis dis fis> |
@@ -125,9 +124,9 @@ keysWaltz = \relative c'' {
keysOutro = \relative c' {
\time 4/4
\set PianoStaff.midiInstrument = #"lead 8 (bass+lead)"
- \repeat volta 3 { cis8 b, cis gis' e' gis, e' gis, |}
+ \repeat volta 3 { cis8 b, cis gis' e' gis, e' gis, |} \mark \markup {"3x"}
<b e gis>2 <b dis fis> |
- \repeat volta 3 { cis8 b, cis gis' e' gis, e' gis, |}
+ \repeat volta 3 { cis8 b, cis gis' e' gis, e' gis, |} \mark \markup {"3x"}
<e' gis b>2 <dis fis b> |
}
@@ -149,17 +148,17 @@ keyboard = \relative c' {
\keysIntro
\mark \default
- \repeat volta 2 \keysA
+ \repeat volta 2 \keysA \mark \markup {"2x"}
\keysAExtended
\keysATransition
\mark \default
- \repeat volta 3 \keysVerse
+ \repeat volta 3 \keysVerse \mark \markup {"3x"}
\keysVerseVariant
\keysVerseHarder
\mark \default
- \repeat volta 2 \keysA
+ \repeat volta 2 \keysA \mark \markup {"2x"}
\keysAExtended
\keysATransitionVariant
@@ -170,9 +169,10 @@ keyboard = \relative c' {
\keysWaltz
\mark \default
- \repeat volta 2 \keysA
+ \repeat volta 2 \keysA \mark \markup {"2x"}
\keysAExtended
\keysATransitionPreOutro
- \repeat volta 2 \keysOutro
+ %% TODO: use segno here? keysOutro contains volta repeats.
+ \repeat volta 2 \keysOutro \mark \markup {"2x"}
\keysEnd
}