Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 2b7d5a8281b11e7fedd46017bd9303090ea3f0b9..bc526e9ca2aa7d98e97085620520b0fc1c0978f2 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -258,8 +258,6 @@ multiple voices on the same staff."
 
   \description "A voice on a percussion staff."
   \remove "Arpeggio_engraver"
-  \consists "Multi_measure_rest_engraver"
-  \consists "Text_spanner_engraver"
   \consists "Grob_pq_engraver"
 
   \remove "Note_head_line_engraver"
@@ -272,7 +270,6 @@ multiple voices on the same staff."
   \remove "Fingering_engraver"
 
   \remove "Cluster_spanner_engraver"
-  \consists "Tuplet_engraver"
 
   \consists "Skip_event_swallow_translator"
 }
@@ -599,7 +596,9 @@ automatically when an output definition (a @code{\score} or
     (Voice Beam thickness 0.384)
     (Voice Beam length-fraction 0.8)
     (Voice Accidental font-size -4)
+    (Voice AccidentalCautionary font-size -4)
     (Voice Slur direction ,DOWN)
+    (Voice Script font-size -3)
   )
 
   keepAliveInterfaces = #'(
@@ -619,7 +618,7 @@ automatically when an output definition (a @code{\score} or
 
   verticallySpacedContexts = #'(Staff)
 
-  hairpinToBarline = ##t 
+  \override Voice #'hairpinToBarline = ##t 
   
   timing = ##t
 }