summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2017-02-27 13:02:34 +0100
committerRicardo Wurmus <rekado@elephly.net>2017-02-27 13:02:34 +0100
commitf20ba240dd47775111cd8474be94c142cda7eb17 (patch)
tree6f5a427fee070fedf33700cd7c9bcca8f8b78c1c
parent87b5cc8f853acb03c3f9622a5e583c602cd3848a (diff)
song 1: Add marks in parts.
-rw-r--r--01-song1/music/bass.ly9
-rw-r--r--01-song1/music/keys.ly9
-rw-r--r--01-song1/music/stick.ly11
3 files changed, 29 insertions, 0 deletions
diff --git a/01-song1/music/bass.ly b/01-song1/music/bass.ly
index 69304ec..6fad056 100644
--- a/01-song1/music/bass.ly
+++ b/01-song1/music/bass.ly
@@ -136,27 +136,36 @@ bassMusic = {
\set Staff.midiMinimumVolume = #1.0
\clef "bass_8"
+ \mark \default
\key cis \minor
\bassIntro
+
+ \mark \default
\repeat volta 2 \bassA
\bassAExtended
\bassATransition
+ \mark \default
\repeat volta 3 \bassVerse
\bassVerseVariant
\bassVerseHarder
+ \mark \default
\repeat volta 2 \bassA
\bassAExtended
\bassATransitionVariant
+ \mark \default
\nastyPause
\bassNasty
+ \mark \default
\bassWaltz
+ \mark \default
\repeat volta 2 \bassA
\bassAExtended
\bassATransitionVariantPreOutro
+ \mark \default
\repeat volta 2 \bassEnd
}
diff --git a/01-song1/music/keys.ly b/01-song1/music/keys.ly
index 5bb51e6..210bc32 100644
--- a/01-song1/music/keys.ly
+++ b/01-song1/music/keys.ly
@@ -143,24 +143,33 @@ keyboard = \relative c' {
\tempo 4 = 90
\clef "treble_8"
%% Intro
+ \mark \default
\time 4/4
\set PianoStaff.midiInstrument = #"electric piano 2"
\keysIntro
+
+ \mark \default
\repeat volta 2 \keysA
\keysAExtended
\keysATransition
+
+ \mark \default
\repeat volta 3 \keysVerse
\keysVerseVariant
\keysVerseHarder
+ \mark \default
\repeat volta 2 \keysA
\keysAExtended
\keysATransitionVariant
+ \mark \default
\nastyPause
\keysNasty
+ \mark \default
\keysWaltz
+ \mark \default
\repeat volta 2 \keysA
\keysAExtended
\keysATransitionPreOutro
diff --git a/01-song1/music/stick.ly b/01-song1/music/stick.ly
index 6f6bd54..a5877bc 100644
--- a/01-song1/music/stick.ly
+++ b/01-song1/music/stick.ly
@@ -316,29 +316,40 @@ stick = <<
\key cis \minor
\clef "treble_8"
+ \mark \default
\time 4/4
\repeat volta 2 \stickIntroRight
+
+ \mark \default
\repeat volta 2 \stickARight
\stickAExtendedRight
\stickATransitionRight
+ \mark \default
\repeat volta 3 \stickVerseRight
\stickVerseVariantRight
\stickVerseHarderRight
+ \mark \default
\repeat volta 2 \stickARight
\stickAExtendedRight
\stickATransitionVariantRight
+ \mark \default
\nastyPause
\stickNastyRight
+
+ \mark \default
\stickWaltzRight
+ \mark \default
\tempo 4 = 185
\repeat volta 2 \stickARight
\stickAExtendedRight
\stickATransitionVariantPreOutroRight
\repeat volta 2 \stickOutroRight
+
+ \mark \default
\stickEndRight
}