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

diff --combined ly/engraver-init.ly
index 47502399a51585d81b769e68156e36f797938eaa,77d01aaad7472c6e346753209870cd2ebeff0e7c..bc526e9ca2aa7d98e97085620520b0fc1c0978f2
--- 1/ly/engraver-init.ly
--- 2/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@@ -258,6 -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"
@@@ -270,6 -272,7 +270,6 @@@
    \remove "Fingering_engraver"
  
    \remove "Cluster_spanner_engraver"
 -  \consists "Tuplet_engraver"
  
    \consists "Skip_event_swallow_translator"
  }
@@@ -596,7 -599,9 +596,9 @@@ automatically when an output definitio
      (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 = #'(