summaryrefslogtreecommitdiff
path: root/02-song2
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2017-02-21 23:09:45 +0100
committerRicardo Wurmus <rekado@elephly.net>2017-02-21 23:09:45 +0100
commitbc3091d3380abd8691ab93c7f5e76edacca472c7 (patch)
treecad95eb452f79b219914a302b04a57867bf29ecf /02-song2
parenta9d88dc660fc75a0c475bbfbb38d3886b60acd44 (diff)
song 2: Move intro from stick to guitar.
Diffstat (limited to '02-song2')
-rw-r--r--02-song2/music/guitar.ly21
-rw-r--r--02-song2/music/stick.ly30
2 files changed, 21 insertions, 30 deletions
diff --git a/02-song2/music/guitar.ly b/02-song2/music/guitar.ly
index ac478c0..e284d36 100644
--- a/02-song2/music/guitar.ly
+++ b/02-song2/music/guitar.ly
@@ -1,16 +1,33 @@
\include "../music/stick.ly"
guitarBreak = {
- \stickIntroLeft
\stickStanzaLeft
\stickBLeft
\stickStanzaLeft
\stickBLeft
}
+%% TODO
+guitarIntro = \relative c {
+ \repeat unfold 2 {
+ <b a' d>8 r16 q8 r16
+ <b gis' d'>4 b8 ~ q b |
+ <b d' g>8 r16 q8 r16
+ <b d' fis>4 b8 ~ q4 |
+
+ <b a' d>8 r16 q8 r16
+ <b gis' d'>4 b8 ~ q b |
+ <b d' g>8 r16 q8 r16
+ <b d' fis>8 ~ q2 |
+ }
+}
+
%% capo 2nd fret
guitar = \relative c {
- \transposition d'
\time 4/4
+ \guitarIntro
+
+ %% add capo 2nd fret
+ \transposition d'
#(mmrest-of-length guitarBreak)
%% transition
diff --git a/02-song2/music/stick.ly b/02-song2/music/stick.ly
index 9f65764..f755c39 100644
--- a/02-song2/music/stick.ly
+++ b/02-song2/music/stick.ly
@@ -1,31 +1,5 @@
\include "../stafftab.ly"
-stickIntroLeft = \relative c {
- \repeat unfold 2 {
- <b a' d>8 r16 q8 r16
- <b gis' d'>4 b8 ~ q b |
- <b g' d'>8 r16 q8 r16
- <b fis' d'>4 b8 ~ q4 |
-
- <b a' d>8 r16 q8 r16
- <b gis' d'>4 b8 ~ q b |
- <b g' d'>8 r16 q8 r16
- <b fis' d'>8 ~ q2 |
- }
-}
-
-stickIntroRight = \relative c' {
- fis8. fis e4 r16 ais,16 b cis d gis, |
- e'8. e d4 ~ d4 r8 |
- \grace{e16} fis8. fis e4 ~ e4 fis8 |
- d8. cis b4 r4. |
-
- \grace{e16} fis8. a8 fis16 e4 r16 ais,16 b cis d gis, |
- fis'8. fis8 r16 e d e d8. r4 |
- \grace{ e8 \glissando s8 } fis8 ~ <fis d'>16 r8 <e cis'>16 r8 <d b'>2 |
- \grace{d32 g32} b16 r8 g r16 fis8 ~ fis2 |
-}
-
stickStanzaLeft = \relative c {
\repeat unfold 2 {
<b fis'>8 r16 q8 r16
@@ -237,7 +211,7 @@ stick = <<
%% intro
\time 4/4
- \stickIntroRight
+ R1*8
\stickStanzaRight
\key e \major
@@ -271,7 +245,7 @@ stick = <<
%% intro
\time 4/4
- \stickIntroLeft
+ R1*8
\stickStanzaLeft
\key e \major