From 1b73a6439cd0e05f0bd767d19cb4a60c3d6f0ad2 Mon Sep 17 00:00:00 2001
From: rekado <rekado@elephly.net>
Date: Sat, 4 Jun 2016 22:29:52 +0200
Subject: Rename directories.

parts -> music
instr -> parts
---
 01-song1/01-song1.ly    |   8 +-
 01-song1/music/bass.ly  | 205 +++++++++++++++++++++++++++++
 01-song1/music/click.ly | 132 +++++++++++++++++++
 01-song1/music/keys.ly  | 172 +++++++++++++++++++++++++
 01-song1/music/stick.ly | 334 ++++++++++++++++++++++++++++++++++++++++++++++++
 01-song1/parts/bass.ly  | 205 -----------------------------
 01-song1/parts/click.ly | 132 -------------------
 01-song1/parts/keys.ly  | 172 -------------------------
 01-song1/parts/stick.ly | 334 ------------------------------------------------
 9 files changed, 847 insertions(+), 847 deletions(-)
 create mode 100644 01-song1/music/bass.ly
 create mode 100644 01-song1/music/click.ly
 create mode 100644 01-song1/music/keys.ly
 create mode 100644 01-song1/music/stick.ly
 delete mode 100644 01-song1/parts/bass.ly
 delete mode 100644 01-song1/parts/click.ly
 delete mode 100644 01-song1/parts/keys.ly
 delete mode 100644 01-song1/parts/stick.ly

(limited to '01-song1')

diff --git a/01-song1/01-song1.ly b/01-song1/01-song1.ly
index acd4036..bd9262e 100644
--- a/01-song1/01-song1.ly
+++ b/01-song1/01-song1.ly
@@ -12,10 +12,10 @@ nastyPause = {
 }
 
 \include "../settings.ly"
-\include "parts/bass.ly"
-\include "parts/keys.ly"
-\include "parts/stick.ly"
-\include "parts/click.ly"
+\include "music/bass.ly"
+\include "music/keys.ly"
+\include "music/stick.ly"
+\include "music/click.ly"
 
 AllMusic = <<
   \new Staff = "keyboard"    { \keyboard }
diff --git a/01-song1/music/bass.ly b/01-song1/music/bass.ly
new file mode 100644
index 0000000..3d67d23
--- /dev/null
+++ b/01-song1/music/bass.ly
@@ -0,0 +1,205 @@
+bassIntro = \relative fis, {
+  \time 4/4
+  R1*4 |
+  cis8 r r4 r4 r8 b |
+  cis8 r r4 r4 r8 b |
+  cis8 r4 cis4 cis r8 | r1 |
+
+  cis8 r r4 r4 r8 b |
+  cis8 r r4 r4 r8 b |
+  cis8 r4 cis4 cis r8 | r1 |
+
+  cis8 r r4 r4 r8 b |
+  cis8 r r4 r4 r8 b |
+  cis8 r4 cis4 cis r8 | r1 |
+}
+
+bassA = \relative fis,, {
+  \time 2/4
+  cis4 cis | cis'4 r8 b | r b r cis, |
+  cis4 cis | cis'4 r8 b |
+  \time 6/8
+  r b r cis r r|
+
+  \time 2/4
+  cis,4 cis | cis'4 r8 b | r b r r |
+  \time 4/4
+  cis,4. dis e4 ~ | e8 fis4. e4 dis |
+}
+
+bassAExtended = \relative fis,, {
+  \time 4/4
+  cis4. dis e4 ~ | e8 fis4. e4 dis |
+  %% more intense!
+  \repeat unfold 4 {
+    cis4. dis e4 ~ | e8 fis4. e4 dis |
+  }
+}
+
+bassATransition = \relative fis,, {
+  \time 4/4 cis1 ~ | cis |
+}
+
+bassVerse = \relative fis, {
+  \time 4/4
+  \key cis \minor
+  cis1 ~ | cis2. cis4 |
+  e,4. e gis4 ~ | gis2 gis |
+  cis1 ~ | cis2 cis4 cis |
+  e,4. e gis4 ~ | gis2. gis4 |
+  a1 ~ | a1 |
+  a4. cis b4 ~ | b1 |
+}
+
+bassVerseVariant = \relative fis,, {
+  \time 4/4
+  \key bes \minor
+  bes4 bes bes bes8 bes8 | bes4 bes4 bes2 |
+  des,4. des f4 ~ | f2 f |
+  bes4 bes bes bes8 bes8 | bes4 bes4 bes2 |
+  des,4. des f4 ~ | f2 f |
+  ges8 r ges r ges r ges4 ~ | ges1 |
+  ges4. bes as4 ~ | as1 |
+}
+
+%% TODO
+bassVerseHarder = \bassVerse
+
+%% TODO
+bassNasty = \relative c, {
+  \time 6/8
+  \key cis \minor
+  \repeat unfold 2 {
+    R2. | R2. |
+    R2. | R2. |
+    R2. | R2. |
+    R2. | R2. |
+
+    R2. | R2. |
+    R2. | R2. |
+    R2. | R2. |
+    R2. | R2. |
+  }
+
+  cis8 cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | cis r cis cis cis r |
+
+  cis cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | cis r cis cis cis r |
+
+  cis8 cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | bis r bis bis bis r |
+
+  \key e \minor
+  b b b r b b | b r c c c r |
+  a a a r a a | es' r es es es r |
+
+  e e e r e e | e r e e fis g |
+  fis fis fis r fis fis | fis g a b c b |
+
+  e, e e r e e | e r e e fis g |
+  ais ais ais r ais ais | a r a a a r |
+
+  e e e r e e | e r e e fis g |
+  fis fis fis r fis fis | fis g a b c b |
+
+  e, e e r e e | e r e e fis g |
+
+  \time 9/8
+  fis fis fis r fis fis fis16-. r fis8 g |
+  \time 3/4
+  a2. ~ | a2. |
+}
+
+%% TODO
+bassWaltz = \relative c, {
+  \time 3/4
+  e2. | es2.  |
+  d2. | cis2. |
+  c2. ~ | c2. ~ | c2 c4 |
+  c4. c4. | c2. ~ | c2. |
+
+  d2. ~ | d2. ~ | d2 d4 |
+  d4. d4. | cis4 c b |
+  \key fis \minor
+  bes2. ~ | bes2. ~ | bes2 bes4 |
+  \time 4/4
+  a4. a a4 |
+  c4. c c4 |
+}
+
+%% TODO
+bassB = \relative c, {
+  \key cis \minor
+  \time 2/4
+  cis4 cis, | cis'4 r8 b | r b r cis, |
+  cis4 cis | cis'4 r8 b |
+  \time 6/8
+  r b r cis r r|
+
+  \time 2/4
+  cis,4 cis | cis'4 r8 b | r b r r |
+  \time 4/4
+  cis,4. dis e4 ~ | e8 fis4. e4 dis |
+}
+
+bassBTransition = \relative c,, {
+  \time 4/4 e4. dis cis4 ~ | cis8 dis4. e4 dis4 |
+}
+
+bassEnd = \relative fis, {
+  \time 4/4
+  \repeat unfold 3 { cis8 b r b cis r cis r |}
+  e e e e b b b b |
+  \repeat unfold 3 { cis8 b r b cis r cis r |}
+  e e e e fis fis fis gis |
+}
+
+
+bassMusic = {
+  \set Staff.midiInstrument = #"electric bass (finger)"
+  \set Staff.pedalSustainStyle = #'bracket
+  \set Staff.midiMinimumVolume = #1.0
+  \clef "bass_8"
+
+  \key cis \minor
+  \bassIntro
+  \repeat volta 2 \bassA
+  \bassAExtended
+  \bassATransition
+
+  \repeat volta 2 \bassVerse
+  \bassVerseVariant
+  \bassVerseHarder
+
+  \repeat volta 2 \bassA
+  \bassAExtended
+  \bassATransition
+
+  \nastyPause
+  \bassNasty
+  \bassWaltz
+
+  \repeat volta 2 \bassB
+  \bassBTransition
+  \repeat volta 2 \bassEnd
+}
+
+bass = <<
+  \new Staff {
+    \bassMusic
+  }
+  \new TabStaff \with {
+    stringTunings = #bass-five-string-tuning
+  } {
+    \override Stem #'transparent = ##t
+    \override Beam #'transparent = ##t
+    \bassMusic
+  }
+>>
diff --git a/01-song1/music/click.ly b/01-song1/music/click.ly
new file mode 100644
index 0000000..4c91b8f
--- /dev/null
+++ b/01-song1/music/click.ly
@@ -0,0 +1,132 @@
+click = \drummode {
+  \tempo 4 = 180
+  \time 4/4
+
+  %% intro
+  hh4 hh hh hh |
+  hh4 hh hh hh |
+  hh4 hh hh hh |
+  hh4 hh hh hh |
+
+  hh4 hh hh hh |
+  hh4 hh hh hh |
+  <bd hh>8 r4 sn4 sn r8 | hh4 hh hh hh |
+
+  <bd hh>4 hh hh hh |
+  <bd hh>4 hh hh hh |
+  <bd hh>4 hh hh hh |
+  <bd hh>4 hh hh hh |
+
+  <bd hh>4 hh hh hh |
+  <bd hh>4 hh hh hh |
+  <bd hh>8 r4 sn4 sn r8 | hh4 hh hh hh |
+
+  %% A
+  \repeat volta 2 {
+    \time 2/4 \repeat unfold 5 { bd4 hh }
+    \time 6/8 { <bd hh>8 hh hh hh hh hh }
+    \time 2/4 \repeat unfold 3 { bd4 hh }
+    \time 4/4 \repeat unfold 2 { <bd hh>4 hh hh hh | }
+  }
+
+  %% A extended
+  \time 4/4 \repeat unfold 2 { <bd hh>4 hh hh hh | }
+  \time 4/4 \repeat unfold 6 { <bd hh>8 hh <sn hh> hh <bd hh> hh <sn hh> hh | }
+  \time 4/4
+  sn8 bd bd sn bd bd sn bd | bd sn bd bd sn bd sn bd |
+  sn8 bd bd sn bd bd sn bd | bd sn bd bd sn4 bd |
+
+  %% Verse
+  \tempo 4 = 175
+  \repeat volta 2 {
+    \time 4/4 \repeat unfold 12 { <bd hh>2 hh | }
+  }
+
+  %% Key-change verse
+  \time 4/4 \repeat unfold 12 { <bd hh>2 hh | }
+
+  %% verse harder
+  \time 4/4 \repeat unfold 12 { <bd hh>2 hh | }
+
+  %% A
+  \tempo 4 = 180
+  \repeat volta 2 {
+    \time 2/4 \repeat unfold 5 { bd4 hh }
+    \time 6/8 { <bd hh>8 hh hh hh hh hh }
+    \time 2/4 \repeat unfold 3 { bd4 hh }
+    \time 4/4 \repeat unfold 2 { <bd hh>4 hh hh hh | }
+  }
+
+  %% A extended
+  \time 4/4 \repeat unfold 2 { <bd hh>4 hh hh hh | }
+  \time 4/4 \repeat unfold 6 { <bd hh>8 hh <sn hh> hh <bd hh> hh <sn hh> hh | }
+  \time 4/4
+  sn8 bd bd sn bd bd sn bd | bd sn bd bd sn bd sn bd |
+  sn8 bd bd sn bd bd sn bd | bd sn bd bd sn4 bd |
+
+  %% Nasty pause
+  \time 6/8
+  \tempo 4 = 185
+  <cymc wbh>4. wbl4.|
+  wbl4. wbl4. |
+
+  wbh4. wbl4. |
+  wbl4. wbl4. |
+
+  wbh4. wbl4. |
+  wbl4. wbl4. |
+
+  wbh4. wbl4. |
+  wbl4. wbl4. |
+
+  %% Nasty
+  \time 6/8
+  \repeat unfold 2 {
+    bd4. bd | bd bd |
+    bd4. bd | bd bd |
+    bd4. bd | bd bd |
+    bd4. bd | bd bd |
+
+    bd4. bd | bd bd |
+    bd4. bd | bd bd |
+    bd4. bd | bd bd |
+    bd4. bd | bd bd |
+  }
+
+  <bd cymc>4. bd | bd bd |
+  bd4. bd | bd bd |
+  bd4. bd | bd bd |
+  bd4. bd | bd bd |
+
+  <bd cymc>4. bd | bd bd |
+  bd4. bd | bd bd |
+  bd4. bd | bd bd |
+  bd4. bd | bd bd |
+
+  <bd cymc>4. bd | bd bd |
+  bd4. bd | bd bd |
+  bd4. bd | bd bd |
+  bd4. bd | bd bd |
+
+  %% key change here
+  bd4. bd | bd bd |
+  bd4. bd | bd bd |
+
+  bd4. bd | bd bd |
+  bd4. bd | bd bd |
+
+  bd4. bd | bd bd |
+  bd4. bd | bd bd |
+
+  bd4. bd | bd bd |
+  bd4. bd | bd bd |
+
+  bd4. bd | bd bd |
+
+  \time 9/8
+  bd8 bd bd r bd bd bd16-. r bd8 bd |
+
+  \tempo 4 = 180
+  \time 3/4
+  bd2. | r2. |
+}
diff --git a/01-song1/music/keys.ly b/01-song1/music/keys.ly
new file mode 100644
index 0000000..232dfed
--- /dev/null
+++ b/01-song1/music/keys.ly
@@ -0,0 +1,172 @@
+keysIntro = {
+  \repeat unfold 16 R1 |
+}
+
+keysA = \relative c' {
+  \key cis \minor
+  \time 2/4
+  r4 r | <e gis>4 r8 <dis fis> | r <dis fis> r r |
+  r4 r | <e gis>4 r8 <dis fis> |
+  \time 6/8
+  r <dis fis> r <e gis> r r|
+
+  \time 2/4
+  r4 r | <e gis>4 r8 <dis fis> | r <dis fis> r r |
+  \time 4/4
+  <cis e>4. <dis fis> <e gis>4 ~ | <e gis>8 <fis a>4. <e gis>4 <dis fis> |
+}
+
+keysAExtended = \relative c' {
+  \time 4/4
+  <cis e>4. <dis fis> <e gis>4 ~ | <e gis>8 <fis a>4. <e gis>4 <dis fis> |
+
+  %% TODO: more intense!
+  \repeat unfold 4 {
+    <cis e>4. <dis fis> <e gis>4 ~ | <e gis>8 <fis a>4. <e gis>4 <dis fis> |
+  }
+}
+
+keysATransition = {
+  \time 4/4 R1 | R1 |
+}
+
+keysVerse = \relative c {
+  \time 4/4
+  \key cis \minor
+  cis4\sustainOn gis' cis dis8 e ~ e2.. r8\sustainOff |
+  <e, b' e fis gis>2.\arpeggio <dis b' cis dis>4\arpeggio ~ <dis b' cis dis>1 |
+  cis4\sustainOn gis' cis dis8 e ~ e2.. r8\sustainOff |
+  <e, b' e fis gis>2.\arpeggio <dis b' cis dis>4\arpeggio ~ <dis b' cis dis>1 |
+  a,2 ~ a4. <a' e' b'>8 ~ <a e' b'>1 |
+  a,4. <a' e' b'>4. b,4 ~ | b1 |
+}
+
+keysVerseVariant = \relative c' {
+  \time 4/4
+  \key bes \minor
+  <bes des f>1 ~ | <bes des f> |
+  <as des f>2. <as c es>4 ~ | <as c es>1 |
+  <bes des f>1 ~ | <bes des f> |
+  <as des f>2. <as c es>4 ~ | <as c es>1 |
+
+  ges4 bes des <ges, bes des f>\arpeggio ~ | <ges bes des f>1 |
+  <ges bes des>4. f'4. <as, c es>4 ~ | <as c es>1 |
+}
+
+%% TODO
+keysVerseHarder = \keysVerse
+
+keysNasty = \relative c' {
+  \time 6/8
+  \key cis \minor
+  \repeat unfold 2 {
+    <gis cis e>2. ~ | <gis cis e>2.   |
+    <a bis dis>2.   | <a bis dis fis> |
+    <gis cis e>   ~ | <gis cis e> ~   |
+    <gis cis e>   ~ | <gis cis e>     |
+
+    <gis cis e>2. ~ | <gis cis e>2.   |
+    <a bis dis>2.   | <fis a bis dis> |
+    <e gis cis>   ~ | <e gis cis> ~   |
+    <e gis cis>   ~ | <e gis cis>     |
+  }
+
+  <gis cis e>2. ~ | <gis cis e>2.   |
+  <a bis dis>2.   | <a bis dis fis> |
+  <gis cis e>   ~ | <gis cis e> ~   |
+  <gis cis e>   ~ | <gis cis e>     |
+
+  <gis cis e>2. ~ | <gis cis e>2.   |
+  <a bis dis>2.   | <fis a bis dis> |
+  <e gis cis>   ~ | <e gis cis> ~   |
+  <e gis cis>   ~ | <e gis cis>     |
+
+  <gis cis e>2. ~ | <gis cis e>     |
+  <a bis dis>     | <a bis dis fis> |
+  <gis cis e> ~   | <gis cis e>     |
+
+  <g ais cis e> | <fis gis bis dis> |
+
+  \key e \minor
+  <fis g b e> ~ | <fis g b e> |
+  <fis a c dis> |  <dis fis a c> |
+  <e g b> ~ | <e g b> |
+  <c dis fis a> |  <dis fis a c> |
+
+  <e g b> ~ | <e g b> |
+  <e g ais cis> | <a b dis> |
+
+  <b e g> ~ | <b e g> |
+  <c dis fis a> | <a c dis fis> |
+  <b e g> ~ | <b e g> |
+
+  \time 9/8
+  <c dis fis a>4 r2 r4. |
+
+  \time 3/4
+  <c dis fis a>2. ~ | <c dis fis a>2. |
+}
+
+keysWaltz = \relative c'' {
+  \time 3/4
+  r4 <g b> <e g> | r <g b> <es g> |
+  r4 <g b> <d g> | r <g b> <cis, e g> |
+  <c e g b>2.\arpeggio | <c e a> | <c e>2 <c e>4 |
+  <c e g b>4. <c e a>4. | <c e>2. ~ | <c e>2. |
+  <d fis b>2.\arpeggio | <d fis a> | <d e>2 <d fis>4 |
+  <d fis b>4. <d fis a>4. | <cis e>4 <c fis> <b g'> |
+  \key fis \minor
+  <bes e gis>2. | <bes cis fis>2. | <bes cis>2 bes4 |
+  \time 4/4
+  <a e' gis>4.  <a cis fis>8 ~ <a cis fis>2 |
+  <c dis gis>4. <c dis fis>8 ~ <c dis fis>2 |
+}
+
+keysBTransition = \relative c' {
+  \time 4/4 <e gis>4. <dis fis> <cis e>4 ~ | <cis e>8 <dis fis>4. e4 dis4 |
+}
+
+keysOutro = \relative c' {
+  \time 4/4
+  \repeat unfold 3 { cis8 b, cis gis e' gis, e' gis, |}
+  <b e gis>2 <b dis fis> |
+  \repeat unfold 3 { cis'8 b, cis gis e' gis, e' gis, |}
+  <e' gis b>2 <dis fis b> |
+}
+
+keysEnd = \relative c {
+  e8 b r b r b4. | r1 |
+  \set PianoStaff.midiInstrument = #"choir aahs"
+  <cis cis' e gis c>1\arpeggio ~ | <cis cis' e gis c> ~ |
+  <cis cis' e gis c>           ~ | <cis cis' e gis c>   |
+}
+
+
+keyboard = \new PianoStaff <<
+  \new Staff \relative c' {
+    \clef "treble_8"
+    %% Intro
+    \time 4/4
+    \set PianoStaff.midiInstrument = #"electric piano 2"
+    \keysIntro
+    \repeat volta 2 \keysA
+    \keysAExtended
+    \keysATransition
+    \repeat volta 2 \keysVerse
+    \keysVerseVariant
+    \keysVerseHarder
+
+    \repeat volta 2 \keysA
+    \keysAExtended
+    \keysATransition
+
+    \nastyPause
+    \keysNasty
+    \keysWaltz
+
+    \repeat volta 2 \keysA
+    \keysBTransition
+    \repeat volta 2 \keysOutro
+    \keysEnd
+  }
+>>
diff --git a/01-song1/music/stick.ly b/01-song1/music/stick.ly
new file mode 100644
index 0000000..c10b8c5
--- /dev/null
+++ b/01-song1/music/stick.ly
@@ -0,0 +1,334 @@
+stickIntroLeft = \relative c {
+  b8  cis gis' r gis r gis b, ~ |
+  b8  cis gis' r gis r gis b, ~ |
+  b8  cis gis' r gis r gis r    |
+  e8  b' e, b' dis,8 b' dis, b' |
+
+  b,8 cis gis' r gis r gis b, ~ |
+  b8  cis gis' r gis r gis b, ~ |
+  b8  cis gis' r gis r gis r    |
+  <e b'>2 <dis b'> |
+}
+
+stickIntroRight = \relative c {
+  \repeat unfold 3 { <fis b dis>4 r8 <gis cis e>4 <gis cis e> r8 | }
+  <gis b e>2 <fis b dis> |
+  \repeat unfold 3 { <fis b dis>4 r8 <gis cis e>4 <gis cis e> r8 | }
+  a'8 gis fis e
+  dis16 e dis8 b4
+}
+
+stickALeft = \relative c' {
+  \key cis \minor
+  \time 2/4
+  cis8 r cis r | r r cis r | r r cis cis |
+  cis8 r cis r | r r cis r |
+  \time 6/8
+  r r cis r cis cis  |
+
+  \time 2/4
+  cis8 r cis r | r r cis r | r r cis r   |
+  \time 4/4
+  r8 r cis r  r cis r r | cis r r cis  r cis r cis |
+}
+
+stickARight = \relative c' {
+  \key cis \minor
+  \time 2/4
+  r4 r | <e gis>4 r8 <dis fis> | r <dis fis> r r |
+  r4 r | <e gis>4 r8 <dis fis> |
+  \time 6/8
+  r <dis fis> r <e gis> r r|
+
+  \time 2/4
+  r4 r | <e gis>4 r8 <dis fis> | r <dis fis> r r |
+  \time 4/4
+  <cis e>4. <dis fis> <e gis>4 ~ | <e gis>8 <fis a>4. <e gis>4 <dis fis> |
+}
+
+stickAExtendedLeft = \relative c {
+  \time 4/4
+  r8 r   cis r  r   cis r r   | cis r r   cis  r cis r  cis |
+  %% more intense!
+  \repeat unfold 4 {
+    r8 cis cis r  cis cis r cis | cis r cis cis  r cis r cis |
+  }
+}
+
+stickAExtendedRight = \relative c' {
+  \time 4/4
+  <cis e>4. <dis fis> <e gis>4 ~ | <e gis>8 <fis a>4. <e gis>4 <dis fis> |
+  \repeat unfold 4 {
+    <cis e>4. <dis fis> <e gis>4 ~ | <e gis>8 <fis a>4. <e gis>4 <dis fis> |
+  }
+}
+
+stickATransitionLeft = \relative c {
+  \time 4/4 cis1 ~ | cis1 |
+}
+stickATransitionRight = \relative c' {
+  \time 4/4 <cis e>1 ~ | <cis e> |
+}
+
+stickVerseLeft = \relative c {
+  \time 4/4
+  \key cis \minor
+  cis4\sustainOn gis' e' cis, ~ cis gis' e' r\sustainOff |
+  e,,\sustainOn b' gis' b, ~ b fis' dis' b,\sustainOff |
+  cis4\sustainOn gis' e' cis, ~ cis gis' e' r\sustainOff |
+  e,,\sustainOn b' gis'\sustainOff b,\sustainOn ~ b fis' dis' b,\sustainOff |
+  a,2 ~ a4. <a' e' b'>8 ~ <a e' b'>1 |
+  a,4. <a' e' b'> b,4 ~ | b1 |
+}
+
+% TODO
+stickVerseRight  = \relative c {
+  \time 4/4
+  \key cis \minor
+  r1 | r1 | r1 | r1 | r1 | r1 |
+  r1 | r1 | r1 | r1 | r1 | r1 |
+}
+
+stickVerseVariantLeft = \relative c {
+  \time 4/4
+  \key bes \minor
+  bes4\sustainOn f' des' bes, ~ bes f' des' r\sustainOff |
+  des,\sustainOn as' f' c,\sustainOff ~ c\sustainOn as' es' c,\sustainOff |
+
+  bes4\sustainOn f' des' bes, ~ bes f' des' r\sustainOff |
+  des,\sustainOn as' f' c,\sustainOff ~ c\sustainOn as' es' c,\sustainOff |
+
+  ges8 r ges r ges r <des' f'>4 ~ | <des f'>1 |
+  ges,,4. <ges' des' as'>4. as,4 ~  | as1 |
+}
+
+% TODO
+stickVerseVariantRight  = \relative c {
+  \time 4/4
+  \key bes \minor
+  r1 | r1 | r1 | r1 | r1 | r1 |
+  r1 | r1 | r1 | r1 | r1 | r1 |
+}
+
+% TODO
+stickVerseHarderLeft = \stickVerseLeft
+
+% TODO
+stickVerseHarderRight = \stickVerseRight
+
+stickNastyLeft = \relative c {
+  \time 6/8
+  \key cis \minor
+  R2.*8 | R2.*8 |
+  \repeat unfold 8 {
+    cis,8 cis' cis, r cis cis' | cis, r cis cis' cis, r |
+  }
+
+  cis' cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | cis r cis cis cis r |
+
+  cis cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | cis r cis cis cis r |
+
+  cis cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | cis r cis cis cis r |
+  cis cis cis r cis cis | bis r bis bis bis r |
+
+  \key e \minor
+  b b b r b b | b r c c c r |
+  a a a r a a | es r es es es r |
+
+  e e e r e e | e r e e fis' g |
+  fis fis fis r fis fis | fis g a b, c b |
+
+  e, e e r e e | e r e e fis' g |
+  ais, ais ais r ais ais | a r a a a r |
+
+  e e e r e e | e r e e fis' g |
+  fis fis fis r fis fis | fis g a b, c b |
+
+  e, e e r e e | e r e e fis' g |
+
+  \time 9/8
+  fis fis fis r fis fis fis16-. r fis8 g |
+
+  \time 3/4
+  a2. ~ | a2. |
+}
+
+stickNastyRight = \relative c {
+  \time 6/8
+  \key cis \minor
+  \repeat unfold 2 { R2.*8 | R2.*8 |}
+
+  e8 e e r e e | e r e e e r |
+  es es es r es es | fis r fis fis fis r |
+  e e e r e e | e r e e e r |
+  e e e r e e | e r e e e r |
+
+  e8 e e r e e | e r e e e r |
+  es es es r es es | fis r fis fis fis r |
+  e e e r e e | e r e e e r |
+  e e e r e e | e r e e e r |
+
+  e8 e e r e e | e r e e e r |
+  es es es r es es | fis r fis fis fis r |
+  e e e r e e | e r e e e r |
+  e e e r e e | es r es es es r |
+
+  \key e \minor
+  e e e r e e | e r e e e r |
+  e e e r e e | es r es es es r |
+
+  e e e r e e | e r e e a b |
+  a a a r a a | a b c es e es |
+
+  e, e e r e e | e r e e a b |
+  ais ais ais r ais ais | a r a a a r |
+
+  e e e r e e | e r e e a b |
+  a a a r a a | a b c es e es |
+
+  e, e e r e e | e r e e a b |
+
+  \time 9/8
+  a a a r a a a16-. r a8 b |
+
+  \time 3/4
+  c2. ~ | c2. |
+}
+
+stickWaltzLeft = \relative c {
+  \time 3/4
+  e4 b' g' | es,4 b' g' |
+  d, b' g' | cis,, a' e' |
+  c,\sustainOn g' e' | r2 c,4 | g'2 c,4 |
+  g'2. ~ | g2. | r2 c,4\sustainOff |
+
+  d4\sustainOn a' fis' | r2 d,4 | a'2 d,4 |
+  a'4. d,4.\sustainOff | cis4 c b |
+  \key fis \minor
+  bes4\sustainOn fis' cis' | r2 bes,4 | fis'2.\sustainOff |
+  \time 4/4
+  a,4 e' cis' a, | c gis' dis' c, |
+}
+
+stickWaltzRight = \relative c'' {
+  \time 3/4
+  r4 <g b> <g b> | r <g b> <g b> |
+  <g b> c d | <g, b>2. |
+  <g b>2.\arpeggio | <e a> | <b e>2 r4 |
+  <g' b>4. <e a>4. | <b e>4 a' b | c b a |
+
+  <g b>2.\arpeggio | <e a> | <b e>2 fis'4 |
+  <g b>4. <e a>4. | e4 fis g |
+  \key fis \minor
+  <e gis>2. | <cis fis>2. | <gis cis>2 r4 |
+
+  \time 4/4
+  <e' gis>4. <cis fis> cis4 |
+  gis'4. fis c4 |
+}
+
+stickBLeft = \stickALeft
+stickBRight = \stickARight
+
+%% TODO: just copied from keys
+stickBTransitionLeft = {
+  \time 4/4 <e gis>4. <dis fis> <cis e>4 ~ | <cis e>8 <dis fis>4. e4 dis4 |
+}
+
+stickBTransitionRight = \relative c' {
+  \time 4/4
+  <e gis>4. <dis fis> <cis e>4 ~ |
+  %% TODO
+  <cis e>8 <dis fis>4. e4 dis4 |
+}
+
+stickOutroLeft = \relative c {
+  \time 4/4
+  \repeat unfold 3 { cis8 b, cis gis' e' cis, e' cis, |}
+  r1 |
+  \repeat unfold 3 { cis'8 b, cis gis' e' cis, e' cis, |}
+  r1 |
+}
+
+stickOutroRight = {}
+
+stickEndLeft = {}
+stickEndRight = {}
+
+
+
+stick = \new PianoStaff <<
+  \set PianoStaff.midiInstrument = #"clav"
+  \set PianoStaff.pedalSustainStyle = #'bracket
+
+  \new Staff \relative c' {
+    \set Staff.midiPanPosition = #-0.7
+    \key cis \minor
+    \clef "treble_8"
+
+    \time 4/4
+    \repeat unfold 2 \stickIntroRight
+    \repeat volta 2 \stickARight
+    \stickAExtendedRight
+    \stickATransitionRight
+
+    \repeat volta 2 \stickVerseRight
+    \stickVerseVariantRight
+    \stickVerseHarderRight
+
+    \repeat volta 2 \stickARight
+    \stickAExtendedRight
+    \stickATransitionRight
+
+    \nastyPause
+    \stickNastyRight
+    \stickWaltzRight
+
+    \repeat volta 2 \stickBRight
+    \stickBTransitionRight
+    \repeat volta 2 \stickOutroRight
+    \stickEndRight
+  }
+
+  %% staff for left hand side
+  \new Staff \relative c  {
+    \set Staff.midiPanPosition = #0.7
+    \key cis \minor
+    \clef "bass"
+
+    \time 4/4
+    \repeat unfold 2 \stickIntroLeft
+    \repeat volta 2 \stickALeft
+    \stickAExtendedLeft
+    \stickATransitionLeft
+
+    \repeat volta 2 \stickVerseLeft
+    \stickVerseVariantLeft
+    \stickVerseHarderLeft
+
+    \repeat volta 2 \stickALeft
+    \stickAExtendedLeft
+    \stickATransitionLeft
+
+    \nastyPause
+    \stickNastyLeft
+    \stickWaltzLeft
+
+    \repeat volta 2 \stickBLeft
+    \stickBTransitionLeft
+    \repeat volta 2 \stickOutroLeft
+    \stickEndLeft
+  }
+>>
+
+%% Local Variables:
+%% compile-command: "make -C .."
+%% End:
diff --git a/01-song1/parts/bass.ly b/01-song1/parts/bass.ly
deleted file mode 100644
index 3d67d23..0000000
--- a/01-song1/parts/bass.ly
+++ /dev/null
@@ -1,205 +0,0 @@
-bassIntro = \relative fis, {
-  \time 4/4
-  R1*4 |
-  cis8 r r4 r4 r8 b |
-  cis8 r r4 r4 r8 b |
-  cis8 r4 cis4 cis r8 | r1 |
-
-  cis8 r r4 r4 r8 b |
-  cis8 r r4 r4 r8 b |
-  cis8 r4 cis4 cis r8 | r1 |
-
-  cis8 r r4 r4 r8 b |
-  cis8 r r4 r4 r8 b |
-  cis8 r4 cis4 cis r8 | r1 |
-}
-
-bassA = \relative fis,, {
-  \time 2/4
-  cis4 cis | cis'4 r8 b | r b r cis, |
-  cis4 cis | cis'4 r8 b |
-  \time 6/8
-  r b r cis r r|
-
-  \time 2/4
-  cis,4 cis | cis'4 r8 b | r b r r |
-  \time 4/4
-  cis,4. dis e4 ~ | e8 fis4. e4 dis |
-}
-
-bassAExtended = \relative fis,, {
-  \time 4/4
-  cis4. dis e4 ~ | e8 fis4. e4 dis |
-  %% more intense!
-  \repeat unfold 4 {
-    cis4. dis e4 ~ | e8 fis4. e4 dis |
-  }
-}
-
-bassATransition = \relative fis,, {
-  \time 4/4 cis1 ~ | cis |
-}
-
-bassVerse = \relative fis, {
-  \time 4/4
-  \key cis \minor
-  cis1 ~ | cis2. cis4 |
-  e,4. e gis4 ~ | gis2 gis |
-  cis1 ~ | cis2 cis4 cis |
-  e,4. e gis4 ~ | gis2. gis4 |
-  a1 ~ | a1 |
-  a4. cis b4 ~ | b1 |
-}
-
-bassVerseVariant = \relative fis,, {
-  \time 4/4
-  \key bes \minor
-  bes4 bes bes bes8 bes8 | bes4 bes4 bes2 |
-  des,4. des f4 ~ | f2 f |
-  bes4 bes bes bes8 bes8 | bes4 bes4 bes2 |
-  des,4. des f4 ~ | f2 f |
-  ges8 r ges r ges r ges4 ~ | ges1 |
-  ges4. bes as4 ~ | as1 |
-}
-
-%% TODO
-bassVerseHarder = \bassVerse
-
-%% TODO
-bassNasty = \relative c, {
-  \time 6/8
-  \key cis \minor
-  \repeat unfold 2 {
-    R2. | R2. |
-    R2. | R2. |
-    R2. | R2. |
-    R2. | R2. |
-
-    R2. | R2. |
-    R2. | R2. |
-    R2. | R2. |
-    R2. | R2. |
-  }
-
-  cis8 cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-
-  cis8 cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | bis r bis bis bis r |
-
-  \key e \minor
-  b b b r b b | b r c c c r |
-  a a a r a a | es' r es es es r |
-
-  e e e r e e | e r e e fis g |
-  fis fis fis r fis fis | fis g a b c b |
-
-  e, e e r e e | e r e e fis g |
-  ais ais ais r ais ais | a r a a a r |
-
-  e e e r e e | e r e e fis g |
-  fis fis fis r fis fis | fis g a b c b |
-
-  e, e e r e e | e r e e fis g |
-
-  \time 9/8
-  fis fis fis r fis fis fis16-. r fis8 g |
-  \time 3/4
-  a2. ~ | a2. |
-}
-
-%% TODO
-bassWaltz = \relative c, {
-  \time 3/4
-  e2. | es2.  |
-  d2. | cis2. |
-  c2. ~ | c2. ~ | c2 c4 |
-  c4. c4. | c2. ~ | c2. |
-
-  d2. ~ | d2. ~ | d2 d4 |
-  d4. d4. | cis4 c b |
-  \key fis \minor
-  bes2. ~ | bes2. ~ | bes2 bes4 |
-  \time 4/4
-  a4. a a4 |
-  c4. c c4 |
-}
-
-%% TODO
-bassB = \relative c, {
-  \key cis \minor
-  \time 2/4
-  cis4 cis, | cis'4 r8 b | r b r cis, |
-  cis4 cis | cis'4 r8 b |
-  \time 6/8
-  r b r cis r r|
-
-  \time 2/4
-  cis,4 cis | cis'4 r8 b | r b r r |
-  \time 4/4
-  cis,4. dis e4 ~ | e8 fis4. e4 dis |
-}
-
-bassBTransition = \relative c,, {
-  \time 4/4 e4. dis cis4 ~ | cis8 dis4. e4 dis4 |
-}
-
-bassEnd = \relative fis, {
-  \time 4/4
-  \repeat unfold 3 { cis8 b r b cis r cis r |}
-  e e e e b b b b |
-  \repeat unfold 3 { cis8 b r b cis r cis r |}
-  e e e e fis fis fis gis |
-}
-
-
-bassMusic = {
-  \set Staff.midiInstrument = #"electric bass (finger)"
-  \set Staff.pedalSustainStyle = #'bracket
-  \set Staff.midiMinimumVolume = #1.0
-  \clef "bass_8"
-
-  \key cis \minor
-  \bassIntro
-  \repeat volta 2 \bassA
-  \bassAExtended
-  \bassATransition
-
-  \repeat volta 2 \bassVerse
-  \bassVerseVariant
-  \bassVerseHarder
-
-  \repeat volta 2 \bassA
-  \bassAExtended
-  \bassATransition
-
-  \nastyPause
-  \bassNasty
-  \bassWaltz
-
-  \repeat volta 2 \bassB
-  \bassBTransition
-  \repeat volta 2 \bassEnd
-}
-
-bass = <<
-  \new Staff {
-    \bassMusic
-  }
-  \new TabStaff \with {
-    stringTunings = #bass-five-string-tuning
-  } {
-    \override Stem #'transparent = ##t
-    \override Beam #'transparent = ##t
-    \bassMusic
-  }
->>
diff --git a/01-song1/parts/click.ly b/01-song1/parts/click.ly
deleted file mode 100644
index 4c91b8f..0000000
--- a/01-song1/parts/click.ly
+++ /dev/null
@@ -1,132 +0,0 @@
-click = \drummode {
-  \tempo 4 = 180
-  \time 4/4
-
-  %% intro
-  hh4 hh hh hh |
-  hh4 hh hh hh |
-  hh4 hh hh hh |
-  hh4 hh hh hh |
-
-  hh4 hh hh hh |
-  hh4 hh hh hh |
-  <bd hh>8 r4 sn4 sn r8 | hh4 hh hh hh |
-
-  <bd hh>4 hh hh hh |
-  <bd hh>4 hh hh hh |
-  <bd hh>4 hh hh hh |
-  <bd hh>4 hh hh hh |
-
-  <bd hh>4 hh hh hh |
-  <bd hh>4 hh hh hh |
-  <bd hh>8 r4 sn4 sn r8 | hh4 hh hh hh |
-
-  %% A
-  \repeat volta 2 {
-    \time 2/4 \repeat unfold 5 { bd4 hh }
-    \time 6/8 { <bd hh>8 hh hh hh hh hh }
-    \time 2/4 \repeat unfold 3 { bd4 hh }
-    \time 4/4 \repeat unfold 2 { <bd hh>4 hh hh hh | }
-  }
-
-  %% A extended
-  \time 4/4 \repeat unfold 2 { <bd hh>4 hh hh hh | }
-  \time 4/4 \repeat unfold 6 { <bd hh>8 hh <sn hh> hh <bd hh> hh <sn hh> hh | }
-  \time 4/4
-  sn8 bd bd sn bd bd sn bd | bd sn bd bd sn bd sn bd |
-  sn8 bd bd sn bd bd sn bd | bd sn bd bd sn4 bd |
-
-  %% Verse
-  \tempo 4 = 175
-  \repeat volta 2 {
-    \time 4/4 \repeat unfold 12 { <bd hh>2 hh | }
-  }
-
-  %% Key-change verse
-  \time 4/4 \repeat unfold 12 { <bd hh>2 hh | }
-
-  %% verse harder
-  \time 4/4 \repeat unfold 12 { <bd hh>2 hh | }
-
-  %% A
-  \tempo 4 = 180
-  \repeat volta 2 {
-    \time 2/4 \repeat unfold 5 { bd4 hh }
-    \time 6/8 { <bd hh>8 hh hh hh hh hh }
-    \time 2/4 \repeat unfold 3 { bd4 hh }
-    \time 4/4 \repeat unfold 2 { <bd hh>4 hh hh hh | }
-  }
-
-  %% A extended
-  \time 4/4 \repeat unfold 2 { <bd hh>4 hh hh hh | }
-  \time 4/4 \repeat unfold 6 { <bd hh>8 hh <sn hh> hh <bd hh> hh <sn hh> hh | }
-  \time 4/4
-  sn8 bd bd sn bd bd sn bd | bd sn bd bd sn bd sn bd |
-  sn8 bd bd sn bd bd sn bd | bd sn bd bd sn4 bd |
-
-  %% Nasty pause
-  \time 6/8
-  \tempo 4 = 185
-  <cymc wbh>4. wbl4.|
-  wbl4. wbl4. |
-
-  wbh4. wbl4. |
-  wbl4. wbl4. |
-
-  wbh4. wbl4. |
-  wbl4. wbl4. |
-
-  wbh4. wbl4. |
-  wbl4. wbl4. |
-
-  %% Nasty
-  \time 6/8
-  \repeat unfold 2 {
-    bd4. bd | bd bd |
-    bd4. bd | bd bd |
-    bd4. bd | bd bd |
-    bd4. bd | bd bd |
-
-    bd4. bd | bd bd |
-    bd4. bd | bd bd |
-    bd4. bd | bd bd |
-    bd4. bd | bd bd |
-  }
-
-  <bd cymc>4. bd | bd bd |
-  bd4. bd | bd bd |
-  bd4. bd | bd bd |
-  bd4. bd | bd bd |
-
-  <bd cymc>4. bd | bd bd |
-  bd4. bd | bd bd |
-  bd4. bd | bd bd |
-  bd4. bd | bd bd |
-
-  <bd cymc>4. bd | bd bd |
-  bd4. bd | bd bd |
-  bd4. bd | bd bd |
-  bd4. bd | bd bd |
-
-  %% key change here
-  bd4. bd | bd bd |
-  bd4. bd | bd bd |
-
-  bd4. bd | bd bd |
-  bd4. bd | bd bd |
-
-  bd4. bd | bd bd |
-  bd4. bd | bd bd |
-
-  bd4. bd | bd bd |
-  bd4. bd | bd bd |
-
-  bd4. bd | bd bd |
-
-  \time 9/8
-  bd8 bd bd r bd bd bd16-. r bd8 bd |
-
-  \tempo 4 = 180
-  \time 3/4
-  bd2. | r2. |
-}
diff --git a/01-song1/parts/keys.ly b/01-song1/parts/keys.ly
deleted file mode 100644
index 232dfed..0000000
--- a/01-song1/parts/keys.ly
+++ /dev/null
@@ -1,172 +0,0 @@
-keysIntro = {
-  \repeat unfold 16 R1 |
-}
-
-keysA = \relative c' {
-  \key cis \minor
-  \time 2/4
-  r4 r | <e gis>4 r8 <dis fis> | r <dis fis> r r |
-  r4 r | <e gis>4 r8 <dis fis> |
-  \time 6/8
-  r <dis fis> r <e gis> r r|
-
-  \time 2/4
-  r4 r | <e gis>4 r8 <dis fis> | r <dis fis> r r |
-  \time 4/4
-  <cis e>4. <dis fis> <e gis>4 ~ | <e gis>8 <fis a>4. <e gis>4 <dis fis> |
-}
-
-keysAExtended = \relative c' {
-  \time 4/4
-  <cis e>4. <dis fis> <e gis>4 ~ | <e gis>8 <fis a>4. <e gis>4 <dis fis> |
-
-  %% TODO: more intense!
-  \repeat unfold 4 {
-    <cis e>4. <dis fis> <e gis>4 ~ | <e gis>8 <fis a>4. <e gis>4 <dis fis> |
-  }
-}
-
-keysATransition = {
-  \time 4/4 R1 | R1 |
-}
-
-keysVerse = \relative c {
-  \time 4/4
-  \key cis \minor
-  cis4\sustainOn gis' cis dis8 e ~ e2.. r8\sustainOff |
-  <e, b' e fis gis>2.\arpeggio <dis b' cis dis>4\arpeggio ~ <dis b' cis dis>1 |
-  cis4\sustainOn gis' cis dis8 e ~ e2.. r8\sustainOff |
-  <e, b' e fis gis>2.\arpeggio <dis b' cis dis>4\arpeggio ~ <dis b' cis dis>1 |
-  a,2 ~ a4. <a' e' b'>8 ~ <a e' b'>1 |
-  a,4. <a' e' b'>4. b,4 ~ | b1 |
-}
-
-keysVerseVariant = \relative c' {
-  \time 4/4
-  \key bes \minor
-  <bes des f>1 ~ | <bes des f> |
-  <as des f>2. <as c es>4 ~ | <as c es>1 |
-  <bes des f>1 ~ | <bes des f> |
-  <as des f>2. <as c es>4 ~ | <as c es>1 |
-
-  ges4 bes des <ges, bes des f>\arpeggio ~ | <ges bes des f>1 |
-  <ges bes des>4. f'4. <as, c es>4 ~ | <as c es>1 |
-}
-
-%% TODO
-keysVerseHarder = \keysVerse
-
-keysNasty = \relative c' {
-  \time 6/8
-  \key cis \minor
-  \repeat unfold 2 {
-    <gis cis e>2. ~ | <gis cis e>2.   |
-    <a bis dis>2.   | <a bis dis fis> |
-    <gis cis e>   ~ | <gis cis e> ~   |
-    <gis cis e>   ~ | <gis cis e>     |
-
-    <gis cis e>2. ~ | <gis cis e>2.   |
-    <a bis dis>2.   | <fis a bis dis> |
-    <e gis cis>   ~ | <e gis cis> ~   |
-    <e gis cis>   ~ | <e gis cis>     |
-  }
-
-  <gis cis e>2. ~ | <gis cis e>2.   |
-  <a bis dis>2.   | <a bis dis fis> |
-  <gis cis e>   ~ | <gis cis e> ~   |
-  <gis cis e>   ~ | <gis cis e>     |
-
-  <gis cis e>2. ~ | <gis cis e>2.   |
-  <a bis dis>2.   | <fis a bis dis> |
-  <e gis cis>   ~ | <e gis cis> ~   |
-  <e gis cis>   ~ | <e gis cis>     |
-
-  <gis cis e>2. ~ | <gis cis e>     |
-  <a bis dis>     | <a bis dis fis> |
-  <gis cis e> ~   | <gis cis e>     |
-
-  <g ais cis e> | <fis gis bis dis> |
-
-  \key e \minor
-  <fis g b e> ~ | <fis g b e> |
-  <fis a c dis> |  <dis fis a c> |
-  <e g b> ~ | <e g b> |
-  <c dis fis a> |  <dis fis a c> |
-
-  <e g b> ~ | <e g b> |
-  <e g ais cis> | <a b dis> |
-
-  <b e g> ~ | <b e g> |
-  <c dis fis a> | <a c dis fis> |
-  <b e g> ~ | <b e g> |
-
-  \time 9/8
-  <c dis fis a>4 r2 r4. |
-
-  \time 3/4
-  <c dis fis a>2. ~ | <c dis fis a>2. |
-}
-
-keysWaltz = \relative c'' {
-  \time 3/4
-  r4 <g b> <e g> | r <g b> <es g> |
-  r4 <g b> <d g> | r <g b> <cis, e g> |
-  <c e g b>2.\arpeggio | <c e a> | <c e>2 <c e>4 |
-  <c e g b>4. <c e a>4. | <c e>2. ~ | <c e>2. |
-  <d fis b>2.\arpeggio | <d fis a> | <d e>2 <d fis>4 |
-  <d fis b>4. <d fis a>4. | <cis e>4 <c fis> <b g'> |
-  \key fis \minor
-  <bes e gis>2. | <bes cis fis>2. | <bes cis>2 bes4 |
-  \time 4/4
-  <a e' gis>4.  <a cis fis>8 ~ <a cis fis>2 |
-  <c dis gis>4. <c dis fis>8 ~ <c dis fis>2 |
-}
-
-keysBTransition = \relative c' {
-  \time 4/4 <e gis>4. <dis fis> <cis e>4 ~ | <cis e>8 <dis fis>4. e4 dis4 |
-}
-
-keysOutro = \relative c' {
-  \time 4/4
-  \repeat unfold 3 { cis8 b, cis gis e' gis, e' gis, |}
-  <b e gis>2 <b dis fis> |
-  \repeat unfold 3 { cis'8 b, cis gis e' gis, e' gis, |}
-  <e' gis b>2 <dis fis b> |
-}
-
-keysEnd = \relative c {
-  e8 b r b r b4. | r1 |
-  \set PianoStaff.midiInstrument = #"choir aahs"
-  <cis cis' e gis c>1\arpeggio ~ | <cis cis' e gis c> ~ |
-  <cis cis' e gis c>           ~ | <cis cis' e gis c>   |
-}
-
-
-keyboard = \new PianoStaff <<
-  \new Staff \relative c' {
-    \clef "treble_8"
-    %% Intro
-    \time 4/4
-    \set PianoStaff.midiInstrument = #"electric piano 2"
-    \keysIntro
-    \repeat volta 2 \keysA
-    \keysAExtended
-    \keysATransition
-    \repeat volta 2 \keysVerse
-    \keysVerseVariant
-    \keysVerseHarder
-
-    \repeat volta 2 \keysA
-    \keysAExtended
-    \keysATransition
-
-    \nastyPause
-    \keysNasty
-    \keysWaltz
-
-    \repeat volta 2 \keysA
-    \keysBTransition
-    \repeat volta 2 \keysOutro
-    \keysEnd
-  }
->>
diff --git a/01-song1/parts/stick.ly b/01-song1/parts/stick.ly
deleted file mode 100644
index c10b8c5..0000000
--- a/01-song1/parts/stick.ly
+++ /dev/null
@@ -1,334 +0,0 @@
-stickIntroLeft = \relative c {
-  b8  cis gis' r gis r gis b, ~ |
-  b8  cis gis' r gis r gis b, ~ |
-  b8  cis gis' r gis r gis r    |
-  e8  b' e, b' dis,8 b' dis, b' |
-
-  b,8 cis gis' r gis r gis b, ~ |
-  b8  cis gis' r gis r gis b, ~ |
-  b8  cis gis' r gis r gis r    |
-  <e b'>2 <dis b'> |
-}
-
-stickIntroRight = \relative c {
-  \repeat unfold 3 { <fis b dis>4 r8 <gis cis e>4 <gis cis e> r8 | }
-  <gis b e>2 <fis b dis> |
-  \repeat unfold 3 { <fis b dis>4 r8 <gis cis e>4 <gis cis e> r8 | }
-  a'8 gis fis e
-  dis16 e dis8 b4
-}
-
-stickALeft = \relative c' {
-  \key cis \minor
-  \time 2/4
-  cis8 r cis r | r r cis r | r r cis cis |
-  cis8 r cis r | r r cis r |
-  \time 6/8
-  r r cis r cis cis  |
-
-  \time 2/4
-  cis8 r cis r | r r cis r | r r cis r   |
-  \time 4/4
-  r8 r cis r  r cis r r | cis r r cis  r cis r cis |
-}
-
-stickARight = \relative c' {
-  \key cis \minor
-  \time 2/4
-  r4 r | <e gis>4 r8 <dis fis> | r <dis fis> r r |
-  r4 r | <e gis>4 r8 <dis fis> |
-  \time 6/8
-  r <dis fis> r <e gis> r r|
-
-  \time 2/4
-  r4 r | <e gis>4 r8 <dis fis> | r <dis fis> r r |
-  \time 4/4
-  <cis e>4. <dis fis> <e gis>4 ~ | <e gis>8 <fis a>4. <e gis>4 <dis fis> |
-}
-
-stickAExtendedLeft = \relative c {
-  \time 4/4
-  r8 r   cis r  r   cis r r   | cis r r   cis  r cis r  cis |
-  %% more intense!
-  \repeat unfold 4 {
-    r8 cis cis r  cis cis r cis | cis r cis cis  r cis r cis |
-  }
-}
-
-stickAExtendedRight = \relative c' {
-  \time 4/4
-  <cis e>4. <dis fis> <e gis>4 ~ | <e gis>8 <fis a>4. <e gis>4 <dis fis> |
-  \repeat unfold 4 {
-    <cis e>4. <dis fis> <e gis>4 ~ | <e gis>8 <fis a>4. <e gis>4 <dis fis> |
-  }
-}
-
-stickATransitionLeft = \relative c {
-  \time 4/4 cis1 ~ | cis1 |
-}
-stickATransitionRight = \relative c' {
-  \time 4/4 <cis e>1 ~ | <cis e> |
-}
-
-stickVerseLeft = \relative c {
-  \time 4/4
-  \key cis \minor
-  cis4\sustainOn gis' e' cis, ~ cis gis' e' r\sustainOff |
-  e,,\sustainOn b' gis' b, ~ b fis' dis' b,\sustainOff |
-  cis4\sustainOn gis' e' cis, ~ cis gis' e' r\sustainOff |
-  e,,\sustainOn b' gis'\sustainOff b,\sustainOn ~ b fis' dis' b,\sustainOff |
-  a,2 ~ a4. <a' e' b'>8 ~ <a e' b'>1 |
-  a,4. <a' e' b'> b,4 ~ | b1 |
-}
-
-% TODO
-stickVerseRight  = \relative c {
-  \time 4/4
-  \key cis \minor
-  r1 | r1 | r1 | r1 | r1 | r1 |
-  r1 | r1 | r1 | r1 | r1 | r1 |
-}
-
-stickVerseVariantLeft = \relative c {
-  \time 4/4
-  \key bes \minor
-  bes4\sustainOn f' des' bes, ~ bes f' des' r\sustainOff |
-  des,\sustainOn as' f' c,\sustainOff ~ c\sustainOn as' es' c,\sustainOff |
-
-  bes4\sustainOn f' des' bes, ~ bes f' des' r\sustainOff |
-  des,\sustainOn as' f' c,\sustainOff ~ c\sustainOn as' es' c,\sustainOff |
-
-  ges8 r ges r ges r <des' f'>4 ~ | <des f'>1 |
-  ges,,4. <ges' des' as'>4. as,4 ~  | as1 |
-}
-
-% TODO
-stickVerseVariantRight  = \relative c {
-  \time 4/4
-  \key bes \minor
-  r1 | r1 | r1 | r1 | r1 | r1 |
-  r1 | r1 | r1 | r1 | r1 | r1 |
-}
-
-% TODO
-stickVerseHarderLeft = \stickVerseLeft
-
-% TODO
-stickVerseHarderRight = \stickVerseRight
-
-stickNastyLeft = \relative c {
-  \time 6/8
-  \key cis \minor
-  R2.*8 | R2.*8 |
-  \repeat unfold 8 {
-    cis,8 cis' cis, r cis cis' | cis, r cis cis' cis, r |
-  }
-
-  cis' cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | cis r cis cis cis r |
-  cis cis cis r cis cis | bis r bis bis bis r |
-
-  \key e \minor
-  b b b r b b | b r c c c r |
-  a a a r a a | es r es es es r |
-
-  e e e r e e | e r e e fis' g |
-  fis fis fis r fis fis | fis g a b, c b |
-
-  e, e e r e e | e r e e fis' g |
-  ais, ais ais r ais ais | a r a a a r |
-
-  e e e r e e | e r e e fis' g |
-  fis fis fis r fis fis | fis g a b, c b |
-
-  e, e e r e e | e r e e fis' g |
-
-  \time 9/8
-  fis fis fis r fis fis fis16-. r fis8 g |
-
-  \time 3/4
-  a2. ~ | a2. |
-}
-
-stickNastyRight = \relative c {
-  \time 6/8
-  \key cis \minor
-  \repeat unfold 2 { R2.*8 | R2.*8 |}
-
-  e8 e e r e e | e r e e e r |
-  es es es r es es | fis r fis fis fis r |
-  e e e r e e | e r e e e r |
-  e e e r e e | e r e e e r |
-
-  e8 e e r e e | e r e e e r |
-  es es es r es es | fis r fis fis fis r |
-  e e e r e e | e r e e e r |
-  e e e r e e | e r e e e r |
-
-  e8 e e r e e | e r e e e r |
-  es es es r es es | fis r fis fis fis r |
-  e e e r e e | e r e e e r |
-  e e e r e e | es r es es es r |
-
-  \key e \minor
-  e e e r e e | e r e e e r |
-  e e e r e e | es r es es es r |
-
-  e e e r e e | e r e e a b |
-  a a a r a a | a b c es e es |
-
-  e, e e r e e | e r e e a b |
-  ais ais ais r ais ais | a r a a a r |
-
-  e e e r e e | e r e e a b |
-  a a a r a a | a b c es e es |
-
-  e, e e r e e | e r e e a b |
-
-  \time 9/8
-  a a a r a a a16-. r a8 b |
-
-  \time 3/4
-  c2. ~ | c2. |
-}
-
-stickWaltzLeft = \relative c {
-  \time 3/4
-  e4 b' g' | es,4 b' g' |
-  d, b' g' | cis,, a' e' |
-  c,\sustainOn g' e' | r2 c,4 | g'2 c,4 |
-  g'2. ~ | g2. | r2 c,4\sustainOff |
-
-  d4\sustainOn a' fis' | r2 d,4 | a'2 d,4 |
-  a'4. d,4.\sustainOff | cis4 c b |
-  \key fis \minor
-  bes4\sustainOn fis' cis' | r2 bes,4 | fis'2.\sustainOff |
-  \time 4/4
-  a,4 e' cis' a, | c gis' dis' c, |
-}
-
-stickWaltzRight = \relative c'' {
-  \time 3/4
-  r4 <g b> <g b> | r <g b> <g b> |
-  <g b> c d | <g, b>2. |
-  <g b>2.\arpeggio | <e a> | <b e>2 r4 |
-  <g' b>4. <e a>4. | <b e>4 a' b | c b a |
-
-  <g b>2.\arpeggio | <e a> | <b e>2 fis'4 |
-  <g b>4. <e a>4. | e4 fis g |
-  \key fis \minor
-  <e gis>2. | <cis fis>2. | <gis cis>2 r4 |
-
-  \time 4/4
-  <e' gis>4. <cis fis> cis4 |
-  gis'4. fis c4 |
-}
-
-stickBLeft = \stickALeft
-stickBRight = \stickARight
-
-%% TODO: just copied from keys
-stickBTransitionLeft = {
-  \time 4/4 <e gis>4. <dis fis> <cis e>4 ~ | <cis e>8 <dis fis>4. e4 dis4 |
-}
-
-stickBTransitionRight = \relative c' {
-  \time 4/4
-  <e gis>4. <dis fis> <cis e>4 ~ |
-  %% TODO
-  <cis e>8 <dis fis>4. e4 dis4 |
-}
-
-stickOutroLeft = \relative c {
-  \time 4/4
-  \repeat unfold 3 { cis8 b, cis gis' e' cis, e' cis, |}
-  r1 |
-  \repeat unfold 3 { cis'8 b, cis gis' e' cis, e' cis, |}
-  r1 |
-}
-
-stickOutroRight = {}
-
-stickEndLeft = {}
-stickEndRight = {}
-
-
-
-stick = \new PianoStaff <<
-  \set PianoStaff.midiInstrument = #"clav"
-  \set PianoStaff.pedalSustainStyle = #'bracket
-
-  \new Staff \relative c' {
-    \set Staff.midiPanPosition = #-0.7
-    \key cis \minor
-    \clef "treble_8"
-
-    \time 4/4
-    \repeat unfold 2 \stickIntroRight
-    \repeat volta 2 \stickARight
-    \stickAExtendedRight
-    \stickATransitionRight
-
-    \repeat volta 2 \stickVerseRight
-    \stickVerseVariantRight
-    \stickVerseHarderRight
-
-    \repeat volta 2 \stickARight
-    \stickAExtendedRight
-    \stickATransitionRight
-
-    \nastyPause
-    \stickNastyRight
-    \stickWaltzRight
-
-    \repeat volta 2 \stickBRight
-    \stickBTransitionRight
-    \repeat volta 2 \stickOutroRight
-    \stickEndRight
-  }
-
-  %% staff for left hand side
-  \new Staff \relative c  {
-    \set Staff.midiPanPosition = #0.7
-    \key cis \minor
-    \clef "bass"
-
-    \time 4/4
-    \repeat unfold 2 \stickIntroLeft
-    \repeat volta 2 \stickALeft
-    \stickAExtendedLeft
-    \stickATransitionLeft
-
-    \repeat volta 2 \stickVerseLeft
-    \stickVerseVariantLeft
-    \stickVerseHarderLeft
-
-    \repeat volta 2 \stickALeft
-    \stickAExtendedLeft
-    \stickATransitionLeft
-
-    \nastyPause
-    \stickNastyLeft
-    \stickWaltzLeft
-
-    \repeat volta 2 \stickBLeft
-    \stickBTransitionLeft
-    \repeat volta 2 \stickOutroLeft
-    \stickEndLeft
-  }
->>
-
-%% Local Variables:
-%% compile-command: "make -C .."
-%% End:
-- 
cgit v1.2.3