Merge remote-tracking branch 'origin' into HEAD

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

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index c4ecf261aa358dd79bcbd2ec7be99eae42fc3bd9..b4a7008b8d4c1f7338557f4f0b0448285bb0b417 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -230,7 +230,6 @@ multiple voices on the same staff."
   \consists "Dots_engraver"
   \consists "Rest_engraver"
   \consists "Tweak_engraver"
-  \consists "Footnote_engraver"
 
   %% switch on to make stem directions interpolate for the
   %% center line.
@@ -556,6 +555,7 @@ automatically when an output definition (a @code{\score} or
   \consists "Parenthesis_engraver"
   \consists "Concurrent_hairpin_engraver"
   \consists "Beam_collision_engraver"
+  \consists "Footnote_engraver"
 
   \defaultchild "Staff"
 
@@ -626,8 +626,7 @@ automatically when an output definition (a @code{\score} or
   beatStructure = #'(1 1 1 1)
   beamExceptions = #'((end . (((1 . 8) . (4 4))
                               ((1 . 12) . (3 3 3 3)))))
-  beamWholeMeasure = ##t
-  beamHalfMeasure = ##f
+  beamHalfMeasure = ##t
 
   autoBeaming = ##t
   autoBeamCheck = #default-auto-beam-check
@@ -1147,8 +1146,6 @@ accommodated for typesetting a piece in Kievan style."
 
  %% There are beams in Kievan notation, but they are invoked manually
  autoBeaming = ##f
- \override Beam #'beam-thickness = #0.32
- \override Beam #'length-fraction = #0.62
 }
 
 \context {