Merge branch 'master' into dev/texi2html

[lilypond.git] / input / lsr / piano-template-with-centered-dynamics.ly

diff --git a/input/lsr/piano-template-with-centered-dynamics.ly b/input/lsr/piano-template-with-centered-dynamics.ly
index 2770aab1f02f9b04208d4b7e8a905ba5a87224b7..4da50138408bddf7eeef3ba1bb26c5189ae49214 100644 (file)
--- a/input/lsr/piano-template-with-centered-dynamics.ly
+++ b/input/lsr/piano-template-with-centered-dynamics.ly
@@ -1,9 +1,9 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.38"
+\version "2.11.51"
 
 \header {
-  lsrtags = "expressive-marks,piano-music,template"
+  lsrtags = "expressive-marks,keyboards,template"
   texidoc = "
 Many piano scores have the dynamics centered between the two staves.
 This requires a bit of tweaking to implement, but since the template is
@@ -17,7 +17,7 @@ upper = \relative c'' {
   \key c \major
   \time 4/4
   
-  a b c d
+  a4 b c d
 }
 
 lower = \relative c {
@@ -29,12 +29,11 @@ lower = \relative c {
 }
 
 dynamics = {
-  s2\fff\> s4
-  s\!\pp
+  s2\fff\> s4 s\!\pp
 }
 
 pedal = {
-  s2\sustainDown s2\sustainUp
+  s2\sustainOn s\sustainOff
 }
 
 \score {
@@ -51,7 +50,8 @@ pedal = {
     \context {
       \type "Engraver_group"
       \name Dynamics
-      \alias Voice % So that \cresc works, for example.
+      % So that \cresc works, for example.
+      \alias Voice
       \consists "Output_property_engraver"
       
       \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1)
@@ -79,19 +79,8 @@ pedal = {
 }
 \score {
   \new PianoStaff <<
-    \new Staff = "upper" << \upper \dynamics >>
-    \new Staff = "lower" << \lower \dynamics >>
-    \new Dynamics = "pedal" \pedal
+    \new Staff = "upper" << \upper \dynamics \pedal >>
+    \new Staff = "lower" << \lower \dynamics \pedal >>
   >>
-  \midi {
-    \context {
-      \type "Performer_group"
-      \name Dynamics
-      \consists "Piano_pedal_performer"
-    }
-    \context {
-      \PianoStaff
-      \accepts Dynamics
-    }
-  }
+  \midi { }
 }