* lily/system.cc (do_derived_mark): don't mark from object_alist_

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

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 314f141a3b5d8fc7d7f74481b14c642e2b8dc4c7..ed3c6134fb8c29869f7307fd4bfca3ccd55f90b8 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.5.18"
 
 \context {
   \name Global
@@ -104,7 +104,7 @@
   \InnerChoirStaff
   \name ChoirStaff
   
-  \defaultchild "InnerChoirStaff"
+  \defaultchild "Staff"
   \accepts "InnerChoirStaff"
   \accepts "InnerStaffGroup"
   \description "Identical to @code{StaffGroup} except that the
@@ -169,7 +169,8 @@ contained staves are not connected vertically."
 
   localKeySignature = #'()
   \consists "Font_size_engraver"
-  
+
+  \consists "Pitched_trill_engraver"
   \consists "Output_property_engraver" 
   \consists "Arpeggio_engraver"
   \consists "Multi_measure_rest_engraver"
@@ -297,6 +298,8 @@ contained staves are not connected vertically."
   systemStartDelimiter = #'SystemStartBracket
 
   \consists "System_start_delimiter_engraver"
+
+  \defaultchild "Staff"
   \accepts "Staff"
   \accepts "RhythmicStaff"
   \accepts "DrumStaff"
@@ -610,9 +613,6 @@ AncientRemoveEmptyStaffContext = \context {
   \remove "New_fingering_engraver"
 
   \description "Context for drawing notes in a Tab staff. "
-  \override Slur #'font-family    = #'roman
-  \override Slur #'print-function = #hammer-print-function
-  \override Slur #'direction = #-1
 
   %% Draws all stems/beams out of the staff (and not in the middle of the staff !)
   %% This feature is now disabled because most of the tab does not use it.