Merge branch 'master' into nested-bookparts

[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 d40410a3890380af2be7f4de3a41a6f40a00f096..7356ba0ef3f9570fea05df99cdb907eb41dc4ddf 100644 (file)
--- a/input/lsr/piano-template-with-centered-dynamics.ly
+++ b/input/lsr/piano-template-with-centered-dynamics.ly
@@ -1,95 +1,99 @@
 %% Do not edit this file; it is auto-generated from input/new
-\version "2.11.35"
+%% This file is in the public domain.
+\version "2.11.62"
 
 \header {
-  doctitle = "Piano template with centered dynamics"
-  lsrtags = "expressive-marks,piano-music,template"
+  texidoces = "
+Muchas partituras de piano tienen las indicaciones dinámicas
+centradas entre los dos pentagramas.  Esto requiere un poco de
+trucaje, pero puesto que la plantilla está aquí mismo, no tenemos
+que hacer este trucaje por nuestra cuenta.
+
+"
+  doctitlees = "Plantilla de piano con matices centrados"
+  
+  texidocde = "
+In der meisten Klaviernotation werden die Dynamikzeichen zwischen 
+den beiden Systemen zentriert. Für LilyPond muss man die Einstellungen 
+etwas anpassen, aber Sie können ja das angepasste Beispiel von hier 
+kopieren.
+"
+
+  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
 right here, you don't have to do the tweaking yourself.
-" }
-% begin verbatim
-upper = \relative c'' {
-  \clef treble
+"
+  doctitle = "Piano template with centered dynamics"
+} % begin verbatim
+
+
+global = {
   \key c \major
   \time 4/4
-  
-  a b c d
+}
+
+upper = \relative c'' {
+  \clef treble
+  a4 b c d
 }
 
 lower = \relative c {
   \clef bass
-  \key c \major
-  \time 4/4
-  
   a2 c
 }
 
 dynamics = {
-  s2\fff\> s4
-  s\!\pp
+  s2\fff\> s4 s\!\pp
 }
 
 pedal = {
-  s2\sustainDown s2\sustainUp
+  s2\sustainOn s\sustainOff
 }
 
 \score {
-  \new PianoStaff <<
-    \new Staff = "upper" \upper
-    \new Dynamics = "dynamics" \dynamics
-    \new Staff = "lower" <<
-      \clef bass
-      \lower
-    >>
+  \new PianoStaff = "PianoStaff_pf" <<
+    \new Staff = "Staff_pfUpper" \upper
+    \new Dynamics = "Dynamics_pf" \dynamics
+    \new Staff = "Staff_pfLower" << \lower >>
     \new Dynamics = "pedal" \pedal
   >>
+
   \layout {
+    % define Dynamics context
     \context {
       \type "Engraver_group"
       \name Dynamics
-      \alias Voice % So that \cresc works, for example.
+      \alias Voice
       \consists "Output_property_engraver"
-      
-      \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1)
-      \override DynamicLineSpanner #'Y-offset = #0
-      pedalSustainStrings = #'("Ped." "*Ped." "*")
-      pedalUnaCordaStrings = #'("una corda" "" "tre corde")
-      
       \consists "Piano_pedal_engraver"
       \consists "Script_engraver"
-      \consists "Dynamic_engraver"
+      \consists "New_dynamic_engraver"
+      \consists "Dynamic_align_engraver"
       \consists "Text_engraver"
-      
-      \override TextScript #'font-size = #2
-      \override TextScript #'font-shape = #'italic
-      
       \consists "Skip_event_swallow_translator"
-      
       \consists "Axis_group_engraver"
+
+      pedalSustainStrings = #'("Ped." "*Ped." "*")
+      pedalUnaCordaStrings = #'("una corda" "" "tre corde")
+      \override DynamicLineSpanner #'Y-offset = #0
+      \override TextScript #'font-size = #2
+      \override TextScript #'font-shape = #'italic
+      \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1)
     }
+    % modify PianoStaff context to accept Dynamics context
     \context {
       \PianoStaff
       \accepts Dynamics
     }
   }
 }
+
 \score {
-  \new PianoStaff <<
-    \new Staff = "upper" << \upper \dynamics >>
-    \new Staff = "lower" << \lower \dynamics >>
-    \new Dynamics = "pedal" \pedal
+  \new PianoStaff = "PianoStaff_pf" <<
+    \new Staff = "Staff_pfUpper" << \global \upper \dynamics \pedal >>
+    \new Staff = "Staff_pfLower" << \global \lower \dynamics \pedal >>
   >>
-  \midi {
-    \context {
-      \type "Performer_group"
-      \name Dynamics
-      \consists "Piano_pedal_performer"
-    }
-    \context {
-      \PianoStaff
-      \accepts Dynamics
-    }
-  }
+  \midi { }
 }