song2: Add crescendo part.

diff --git a/02-song2/music/bass.ly b/02-song2/music/bass.ly
index c19f8a04719143f3f296ef4fd175c20ae0bf9183..a027bd1611e3e7818bbf1a96fb88094b0347a6f3 100644 (file)
--- a/02-song2/music/bass.ly
+++ b/02-song2/music/bass.ly
@@ -42,6 +42,14 @@ bassTransition = \relative fis,, {
   }
 }
 
+bassCrescendo = \relative fis,, {
+  \time 6/8
+  e16\ppp\< fis8 fis8 fis16 e16 fis8 fis8 fis16       |
+  e16       fis8 fis8 fis16 e16 fis8 fis8 fis16       |
+  e16       fis8 fis8 fis16 e16 fis8 fis8 fis16       |
+  e16       fis8 fis8 fis16 e16 fis8 fis8 fis16\!\fff |
+}
+
 bassThree = \relative fis,, {
   \time 6/8
   \repeat volta 2 {
@@ -133,6 +141,7 @@ bassMusic = {
 
   \key fis \minor
   \bassTransition
+  \bassCrescendo
   \bassThree
 
   \bassMartaRekado

diff --git a/02-song2/music/click.ly b/02-song2/music/click.ly
index 60c6a956792ddee889c70e70d4a71d4e5ccb925d..94bbc42da7db05f8c0fafcd67c15ed9f956d6554 100644 (file)
--- a/02-song2/music/click.ly
+++ b/02-song2/music/click.ly
@@ -28,6 +28,14 @@ click = \drummode {
     hh4 hh hh hh | hh4 hh hh hh |
   }
 
+  %% crescendo
+  \time 6/8
+  sn16\ppp\< sn  sn sn  sn sn  sn sn  sn sn  sn sn |
+  sn16       sn  sn sn  sn sn  sn sn  sn sn  sn sn |
+  sn16       sn  sn sn  sn sn  sn sn  sn sn  sn sn |
+  sn16       sn  sn sn  sn sn  sn sn  sn sn  sn sn\!\fff |
+
+
   %% three
   \time 6/8
   \repeat volta 2 {

diff --git a/02-song2/music/guitar.ly b/02-song2/music/guitar.ly
index c68decf5b46c6f49a2247dee22558fe23b84bef1..49399a33eab991758eea7370cb4698c5778ee64e 100644 (file)
--- a/02-song2/music/guitar.ly
+++ b/02-song2/music/guitar.ly
@@ -22,10 +22,20 @@ guitar = \relative c {
     <b e>16 r16 <b e>16 <a d>4 r8 |
   }
 
+  %% crescendo
+  \time 6/8
+  d16\5\ppp\< e8\5 e8\5 e16\5 d16\5 e8\5 e8\5 e16\5 |
+  d16\5       e8\5 e8\5 e16\5 d16\5 e8\5 e8\5 e16\5 |
+
+  d16\5   <e,\6 e'\5>8 q8 q16
+  d'16\5  <e,\6 e'\5>8 q8 q16 |
+  d'16\5  <e,\6 e'\5>8 q8 q16
+  d'16\5  <e,\6 e'\5>8 q8 q16\!\fff |
+
   %% three
   \time 6/8
   \repeat volta 2 {
-    <d\5 fis\4>16  <e\5 g\4>8 q q16   q16 <fis\5 a\4>8 q q16 |
+    <d'\5 fis\4>16  <e\5 g\4>8 q q16   q16 <fis\5 a\4>8 q q16 |
     q16 <g\5 b\4>8 q r16 a,8\5 <a\5 a'\4 cis\3 g'\2> q |
   }
 

diff --git a/02-song2/music/keys.ly b/02-song2/music/keys.ly
index 027598e3ec8e86509d4163c88e4fa884f92a1747..6112073f1e986495cb2e7d8d920b101a9041dbf6 100644 (file)
--- a/02-song2/music/keys.ly
+++ b/02-song2/music/keys.ly
@@ -11,6 +11,11 @@ keysTransition = \relative c' {
   \repeat volta 4 { R1 | R1 |}
 }
 
+keysCrescendo = {
+  \time 6/8
+  \repeat unfold 4 { R2. |}
+}
+
 keysThree = {
   \time 6/8
   \repeat volta 2 { R2.*2 }
@@ -86,6 +91,7 @@ keyboard = \relative c' {
     \set Staff.midiInstrument = #"pad 2 (warm)"
     \key fis \minor
     \keysTransition
+    \keysCrescendo
     \keysThree
 
     \set Staff.midiInstrument = #"lead 8 (bass+lead)"

diff --git a/02-song2/music/stick.ly b/02-song2/music/stick.ly
index b95507dafcb335df896e945c12b7f8d2b62d0505..3f7aa9a1ad87107d49f75a6c1e67ae31fefac213 100644 (file)
--- a/02-song2/music/stick.ly
+++ b/02-song2/music/stick.ly
@@ -83,6 +83,16 @@ stickTransitionRight = \relative c' {
   \repeat volta 4 { R1*2 }
 }
 
+stickCrescendoLeft = \relative c, {
+  \time 6/8
+  \repeat unfold 4 { R2. |}
+}
+
+stickCrescendoRight = \relative c' {
+  \time 6/8
+  \repeat unfold 4 { R2. |}
+}
+
 stickThreeLeft = \relative c, {
   \time 6/8
   \repeat volta 2 { R2.*2 }
@@ -231,6 +241,7 @@ stick = <<
     \key fis \minor
     \set PianoStaff.midiInstrument = #"electric guitar (jazz)"
     \stickTransitionRight
+    \stickCrescendoRight
     \stickThreeRight
 
     \stickMartaRekadoRight
@@ -262,6 +273,7 @@ stick = <<
 
     \key fis \minor
     \stickTransitionLeft
+    \stickCrescendoLeft
     \stickThreeLeft
 
     \stickMartaRekadoLeft

diff --git a/TODO.org b/TODO.org
index af599f8050130fb9232332861466c2fbcf94f56a..9a88796e5ced8c9ff5973165e074402a1c43fcff 100644 (file)
--- a/TODO.org
+++ b/TODO.org
@@ -32,7 +32,6 @@ highest string on bass side
 
 
 * song 2
-missing crescendo part
 * circus
 add missing dedilaedilaedidum
 * white noise