song1: keys: Print note names.

diff --git a/01-song1/01-song1.ly b/01-song1/01-song1.ly
index 0dba940209c7b7f695b7399dc727d445a965e253..c6d6a4247582aed7d45612be99a3860ea880e93d 100644 (file)
--- a/01-song1/01-song1.ly
+++ b/01-song1/01-song1.ly
@@ -26,7 +26,14 @@ AllMusic = <<
     instrumentName = #"Synthesizer"
     shortInstrumentName = #"Synth"
     pedalSustainStyle = #'bracket
-  } { \keyboard }
+  } {
+    <<
+      \new Staff {
+        \clef treble
+        \keyboard
+      }
+    >>
+  }
   \new StaffGroup = "bass"
   \with {
     instrumentName = #"Bass"

diff --git a/01-song1/music/keys.ly b/01-song1/music/keys.ly
index c991085b77a60d4d569348de486e3a31424b93af..8a3c90a918c95339bf600b8ecaa745ed1b4d72bc 100644 (file)
--- a/01-song1/music/keys.ly
+++ b/01-song1/music/keys.ly
@@ -151,8 +151,7 @@ keysEnd = \relative c {
 }
 
 
-keyboard = <<
-  \new Staff \relative c' {
+keyboard = \relative c' {
     \tempo 4 = 90
     \clef "treble_8"
     %% Intro
@@ -179,5 +178,4 @@ keyboard = <<
     \keysATransitionPreOutro
     \repeat volta 2 \keysOutro
     \keysEnd
-  }
->>
+}

diff --git a/01-song1/parts/keys.ly b/01-song1/parts/keys.ly
index 77c24254f669c92caf84cb9af5879ad90215b805..67b248d50fe21ba848092f938130d13587628d36 100644 (file)
--- a/01-song1/parts/keys.ly
+++ b/01-song1/parts/keys.ly
@@ -12,7 +12,22 @@
 \include "../music/keys.ly"
 
 \score {
-  \compressMMRests { \keyboard }
+  \new PianoStaff = "keyboard" \with {
+    pedalSustainStyle = #'bracket
+  } {
+    <<
+      \new Staff {
+        <<
+          \clef treble
+          \compressMMRests \keyboard
+          \context NoteNames = "upper" {
+            \set printOctaveNames = ##f
+            \compressMMRests \keyboard
+          }
+        >>
+      }
+    >>
+  }
   \layout {
     indent = #0
     short-indent = #0