Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / ly / performer-init.ly

diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index e4c8d9a649ec4c74c599c5ced0aef0635f2c7974..d22c42277531198414fcad979d63ea8ef534905a 100644 (file)
--- a/ly/performer-init.ly
+++ b/ly/performer-init.ly
@@ -1,96 +1,105 @@
-\version "2.1.26"
+\version "2.7.39"
 
-                               %
-                               % setup for Request->Element conversion. Guru-only
-                               %
-\translator {
-    \type "Staff_performer"
+%%
+%% setup for Request->Element conversion. 
+%%
+\context {
+    \type "Performer_group"
     \name Staff
     \accepts Voice
-
+    \defaultchild Voice
+    
+    \consists "Staff_performer"
     \consists "Key_performer"
     \consists "Tempo_performer"
     \consists "Time_signature_performer"
 }
-\translator {
+\context {
     \name Global
     \accepts Score
 \description "Hard coded entry point for LilyPond. Cannot be tuned."
     }
-\translator {
-    \StaffContext
+
+\context {
+    \Staff
     \name DrumStaff
     midiInstrument = #"drums"
     \accepts DrumVoice
+    \defaultchild DrumVoice
 }
 
-\translator {
-    \type "Performer_group_performer"
+\context {
+    \type "Performer_group"
     \name Voice
-    \consists "Dynamic_performer"
+    % The order of the dynamic performers is significant: absolute dynamic events must override crescendo events in midi.
     \consists "Span_dynamic_performer"
+    \consists "Dynamic_performer"
     \consists "Tie_performer"
     \consists "Piano_pedal_performer"
+    \consists "Note_performer"
+    \consists "Beam_performer"
+    \consists "Slur_performer"
+    \consists "Melisma_translator"
 }
 
-\translator {
-    \VoiceContext
+\context {
+  \Voice
+  \name CueVoice
+  \alias Voice
+}
+
+\context {
+    \Voice
     \remove "Note_performer"
     \consists "Drum_note_performer" 
     \name DrumVoice
 }
 
-\translator {
-    \type "Performer_group_performer"
-    \name Voice
-    \consists "Note_performer"
-    \consists "Beam_performer"
-    \consists "Slur_performer"
-    \consists "Melisma_translator"
-}
-
-\translator {
-    \type "Performer_group_performer"
+\context {
+    \type "Performer_group"
     \name FiguredBass 
     \consists "Swallow_performer"
 }
 
-\translator {
-    \type "Performer_group_performer"
+\context {
+    \type "Performer_group"
     \name GrandStaff
     \accepts RhythmicStaff
     \accepts Staff
+    \defaultchild Staff
 }
 
-\translator {
-    \type "Performer_group_performer"
+\context {
+    \type "Performer_group"
     \name "PianoStaff"
     \accepts Staff
     \accepts DrumStaff
+    \defaultchild Staff
 }
 
-\translator {
-    \type "Performer_group_performer"
+\context {
+    \type "Performer_group"
     \name "TabVoice"
     \consists "Swallow_performer"
 }
 
-\translator {
-    \type "Performer_group_performer"
+\context {
+    \type "Performer_group"
     \name "Devnull"
     \consists "Swallow_performer"
 }
-\translator {
-    \type "Performer_group_performer"
+\context {
+    \type "Performer_group"
     \name "TabStaff"
     \accepts "TabVoice"
+    \defaultchild "TabVoice"
 }
 
-\translator {
+\context {
     \type "Score_performer"
 
     \name Score
-    \alias Timing
+    
     melismaBusyProperties = #default-melisma-properties
     instrument = #"bright acoustic"
     \accepts Staff
@@ -106,52 +115,62 @@
     \accepts ChordNames
     \accepts FiguredBass
     \accepts Lyrics
-    \alias "Timing"
+    
     \consists "Timing_translator"
     \consists "Swallow_performer"
+
+    \defaultchild "Staff"
     
     dynamicAbsoluteVolumeFunction = #default-dynamic-absolute-volume
     instrumentEqualizer = #default-instrument-equalizer
-    drumPitchTable = #(alist->hash-table midiDrumPitches) 
+    drumPitchTable = #(alist->hash-table midiDrumPitches)
+    timing = ##t 
 }
 
 
-\translator {
-    \type "Staff_performer" % Performer_group_performer ?
+\context {
+    \type "Performer_group"
+    \consists "Staff_performer" % Performer_group ?
     \consists "Lyric_performer"
     \name Lyrics
     \consists "Time_signature_performer"
     \consists "Tempo_performer"
 }
 
-\translator{
-    \type "Performer_group_performer"
+\context{
+    \type "Performer_group"
     \name ChoirStaff
     \accepts Staff
     \accepts DrumStaff
+    \defaultchild Staff
+
 }
 
 
-\translator {
-    \type "Staff_performer"
+
+\context {
+    \type "Performer_group"
+    \consists "Staff_performer"
     \accepts ChordNameVoice
     \name ChordNames
 }
 
-\translator {
-    \type "Performer_group_performer"
+\context {
+    \type "Performer_group"
     \consists "Note_performer"
     \name ChordNameVoice       
 }
 
-\translator {
-    \type "Performer_group_performer"
+\context {
+    \type "Performer_group"
 
     \name StaffGroup
     \accepts Staff
     \accepts DrumStaff
+
+    \defaultchild Staff
 }
 
-\translator { \StaffContext \name RhythmicStaff }
+\context { \Staff \name RhythmicStaff }