circus: keys: Print note names on keys part.

diff --git a/03-circus/03-circus.ly b/03-circus/03-circus.ly
index 8092e9e9dc0d844d86dc09fa32751fc7850c1874..18132ce57ccdf5774bd9effbbb4ad6ebf17f625a 100644 (file)
--- a/03-circus/03-circus.ly
+++ b/03-circus/03-circus.ly
@@ -24,7 +24,18 @@ AllMusic = <<
     instrumentName = #"Synthesizer"
     shortInstrumentName = #"Synth"
     pedalSustainStyle = #'bracket
-  } { \keyboard }
+  } {
+    <<
+      \new Staff {
+        \clef treble
+        \keyboardUpper
+      }
+      \new Staff {
+        \clef bass
+        \keyboardLower
+      }
+    >>
+  }
   \new StaffGroup = "bass"
   \with {
     instrumentName = #"Bass"

diff --git a/03-circus/music/keys.ly b/03-circus/music/keys.ly
index 5c5ffc380053b061877e8a26d8804d8650077c50..0a82331c0a3bc9917d6c2ceb6ed1a104d6ccaa05 100644 (file)
--- a/03-circus/music/keys.ly
+++ b/03-circus/music/keys.ly
@@ -266,8 +266,7 @@ keysFinalLower = \relative c {
   d2. | d2. |
 }
 
-keyboard = <<
-  \new Staff \relative c'  {
+keyboardUpper = \relative c'  {
     \set Staff.midiInstrument = #"reed organ"
     \time 2/4
     \key cis \minor
@@ -314,10 +313,9 @@ keyboard = <<
     \transpose c d { \keysArpeggioHigherUpper }
     \keysDramaUpper
     \keysFinalUpper
-  }
+}
 
-  \new Staff \relative c {
-    \clef bass
+keyboardLower = \relative c {
     \set Staff.midiInstrument = #"reed organ"
     \key cis \minor
     r2 | r2 |
@@ -362,5 +360,4 @@ keyboard = <<
     \transpose c d { \keysArpeggioHigherLower }
     \keysDramaLower
     \keysFinalLower
-  }
->>
+}

diff --git a/03-circus/parts/keys.ly b/03-circus/parts/keys.ly
index c27a1210b89047ede23591c9bff2b9b5b1adff2d..1af7bf2e7968733a9d0a02e9f2cc7368aca57b2c 100644 (file)
--- a/03-circus/parts/keys.ly
+++ b/03-circus/parts/keys.ly
@@ -14,7 +14,28 @@
   \new PianoStaff = "keyboard" \with {
     pedalSustainStyle = #'bracket
   } {
-    \compressMMRests \keyboard
+    <<
+      \new Staff {
+        <<
+          \clef treble
+          \compressMMRests \keyboardUpper
+          \context NoteNames = "upper" {
+            \set printOctaveNames = ##f
+            \compressMMRests \keyboardUpper
+          }
+        >>
+      }
+      \new Staff {
+        <<
+          \clef bass
+          \compressMMRests \keyboardLower
+          \context NoteNames = "lower" {
+            \set printOctaveNames = ##f
+            \compressMMRests \keyboardLower
+          }
+        >>
+      }
+    >>
   }
   \layout {
     \tempo 4 = 90