Emit not-quite-cross-staff beams in the right context.

[lilypond.git] / lily / auto-beam-engraver.cc

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 66b79fe008c59b0c2612c03425c2871af991c9cd..0d5fa60ed2444cb8d5e9061fc3613c32613f4794 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -80,6 +80,7 @@ private:
   Moment extend_mom_;
   Moment beam_start_moment_;
   Moment beam_start_location_;
+  Context *beam_start_context_;
 
   // We act as if beam were created, and start a grouping anyway.
   Beaming_pattern *grouping_;
@@ -219,7 +220,9 @@ Auto_beam_engraver::create_beam ()
   for (vsize i = 0; i < stems_->size (); i++)
     Beam::add_stem (beam, (*stems_)[i]);
 
-  announce_grob (beam, (*stems_)[0]->self_scm ());
+  Grob_info i = make_grob_info (beam, (*stems_)[0]->self_scm ());
+  i.rerouting_daddy_context_ = beam_start_context_;
+  announce_grob (i);
 
   return beam;
 }
@@ -238,6 +241,7 @@ Auto_beam_engraver::begin_beam ()
   beaming_options_.from_context (context ());
   beam_settings_ = updated_grob_properties (context (), ly_symbol2scm ("Beam"));
 
+  beam_start_context_ = context ()->get_parent_context ();
   beam_start_moment_ = now_mom ();
   beam_start_location_
     = robust_scm2moment (get_property ("measurePosition"), Moment (0));
@@ -269,7 +273,10 @@ Auto_beam_engraver::end_beam ()
 
       if (finished_beam_)
        {
-         announce_end_grob (finished_beam_, SCM_EOL);
+         Grob_info i = make_grob_info (finished_beam_, SCM_EOL);
+         i.rerouting_daddy_context_ = beam_start_context_;
+
+         announce_end_grob (i);
          finished_grouping_ = grouping_;
          finished_beaming_options_ = beaming_options_;
        }