Rename directories.

parts -> music
instr -> parts

1 files changed, 21 insertions, 92 deletions

diff --git a/02-song2/parts/keys.ly b/02-song2/parts/keys.ly
index c25a5b8..df4da9b 100644
--- a/02-song2/parts/keys.ly
+++ b/02-song2/parts/keys.ly
@@ -1,99 +1,28 @@
-keysA = { R1*8 }
-keysB = { R1*4 }
+\version "2.19.27"
 
-keysTransition = \relative c' {
-  \repeat volta 2 {
-    <cis fis a>1 | <b e gis>1   |
-    <a d fis>1   | <a cis fis>1 |
-  }
-
-  %% TODO
-  \repeat volta 4 { R1 | R1 |}
+\header {
+  title = "Song 2"
+  subtitle = "Keyboard"
+  composer = "The very pretentious elephlies"
+  copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
 }
 
-keysThree = {
-  \time 6/8
-  \repeat unfold 2 { R2. | R2. |}
-  R2. | R2. | R2. |
-  R8*6 |
-}
+\include "../settings.ly"
+\include "music/keys.ly"
 
-keysMartaRekado = \relative c' {
-  \repeat unfold 2 {
-    \time 5/8
-    cis''16 a fis cis r cis8 fis a16  |
-    \time 7/8
-    gis8 e b e16 e8 fis16 r16 b,8 e16 |
-  } \alternative {
-    { \time 2/4 cis8. a16 b a gis a |}
-    { \time 2/4 cis8. a16 b a gis a |}
+\score {
+  \new Staff \with {
+    pedalSustainStyle = #'bracket
+  } {
+    \tempo 4 = 90
+    \compressMMRests { \keyboard }
   }
-
-  \time 3/4
-  d,16 a fis a fis' a
-  gis e b e gis b  |
-  a fis d fis a cis
-  b gis e gis e' d |
-
-  %% TODE simplify
-  fis cis a gis a cis
-  b e e, a b cis  |
-
-  %% TODO
-  \time 7/8
-  a a' fis cis cis d8 d8 r r8. |
-}
-
-keysReprise = \relative c' {
-  \time 4/4
-  \repeat unfold 2 {
-    <cis fis a cis>2 ~               <cis es a cis>2  |
-    <c f a d>4. ~ <cis fis a cis>8 ~ <cis fis a cis>2 |
-    <cis fis a fis'>2 ~              <cis es a fis'>2 |
-    <c f a d>4. ~ <cis fis a cis>8 ~ <cis fis a cis>2 |
-  }
-}
-
-keysFinal = \relative c' {
-  \ottava #-1
-  \repeat volta 4 {
-    \tuplet 6/2 { a'8\sustainOn fis dis cis a fis ~ } fis2   cis16\sustainOff dis gis8 |
-    a16 d fis d fis gis a8 ~ a2 |
-
-    \tuplet 6/2 { cis8\sustainOn a fis dis cis fis, }
-    b8.\sustainOff dis,16\sustainOn a' cis fis\sustainOff gis a-. b-. cis-. d-.
-    <cis a>16 r8 <b gis>16 r8 a16 gis fis\sustainOn cis a gis fis4\sustainOff
-  }
-
-  <b dis fis>16 r8 <b dis fis>16 r8 <b dis fis>4. r8 r  |
-  <a d fis>8 r <a d fis> r16 <a cis e>8. a8 <a cis e> r |
-  <b dis fis>16 r8 <b dis fis>16 r8 <b dis fis>4. r8 r  |
-  f8 b r8 d16 f gis1.\trill
-}
-
-keyboard = \relative c' {
-    %% Intro
-    \time 4/4
-    \key b \minor
-    R1*8
-
-    \repeat unfold 2 {
-      \key b \minor
-      \keysA
-      \key e \major
-      \keysB
+  \layout {
+    indent = #0
+    short-indent = #0
+    \context {
+      \Score
+      \numericTimeSignature
     }
-
-    \set Staff.midiInstrument = #"pad 2 (warm)"
-    \key fis \minor
-    \keysTransition
-    \keysThree
-
-    \set Staff.midiInstrument = #"lead 8 (bass+lead)"
-    \keysMartaRekado
-
-    \set Staff.midiInstrument = #"string ensemble 1"
-    \keysReprise
-    \set Staff.midiInstrument = #"electric piano 1"
-    \keysFinal
   }
+}