X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fauto-beam-engraver.cc;h=41c96eae76b84f2c5468526d93406ce2c7527663;hb=b1d802ef08915cd1d87f7dfb5ff45beeabf6e9fb;hp=66b79fe008c59b0c2612c03425c2871af991c9cd;hpb=475a1f94b5733476d746d2c012809f3f2e6f0fcc;p=lilypond.git

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 66b79fe008..41c96eae76 100644
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1999--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 #include "beaming-pattern.hh"
 #include "beam.hh"
 #include "context.hh"
+#include "context-handle.hh"
 #include "duration.hh"
 #include "engraver.hh"
 #include "item.hh"
@@ -80,6 +81,10 @@ private:
   Moment extend_mom_;
   Moment beam_start_moment_;
   Moment beam_start_location_;
+  /*
+    Handle on the starting staff keeps it alive until beam is comlete
+  */
+  Context_handle beam_start_context_;
 
   // We act as if beam were created, and start a grouping anyway.
   Beaming_pattern *grouping_;
@@ -87,11 +92,9 @@ private:
 
   Beaming_pattern *finished_grouping_;
 
-
   Beaming_options beaming_options_;
   Beaming_options finished_beaming_options_;
 
-
   void check_bar_property ();
 };
 
@@ -126,7 +129,7 @@ Auto_beam_engraver::process_music ()
   if (stems_)
     {
       if (extend_mom_ < now)
-	end_beam ();
+        end_beam ();
     }
 
   if (scm_is_string (get_property ("whichBar")))
@@ -138,9 +141,9 @@ Auto_beam_engraver::process_music ()
   if (forbid_)
     {
       if (stems_)
-	end_beam ();
+        end_beam ();
       else
-	junk_beam ();
+        junk_beam ();
     }
 }
 
@@ -167,11 +170,11 @@ bool
 Auto_beam_engraver::test_moment (Direction dir, Moment test_mom, Moment dur)
 {
   return scm_call_4 (get_property ("autoBeamCheck"),
-		     context ()->self_scm (),
-		     scm_from_int (dir),
+                     context ()->self_scm (),
+                     scm_from_int (dir),
                      test_mom.smobbed_copy (),
-		     dur.smobbed_copy ())
-    != SCM_BOOL_F;
+                     dur.smobbed_copy ())
+         != SCM_BOOL_F;
 }
 
 void
@@ -183,7 +186,7 @@ Auto_beam_engraver::consider_begin (Moment test_mom, Moment dur)
     {
       bool b = test_moment (START, test_mom, dur);
       if (b)
-	begin_beam ();
+        begin_beam ();
     }
 }
 
@@ -193,10 +196,10 @@ Auto_beam_engraver::consider_end (Moment test_mom, Moment dur)
   if (stems_)
     {
       /* Allow already started autobeam to end:
-	 don't check for autoBeaming */
+         don't check for autoBeaming */
       bool b = test_moment (STOP, test_mom, dur);
       if (b)
-	end_beam ();
+        end_beam ();
     }
 }
 
@@ -219,7 +222,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_.get_context ();
+  announce_grob (i);
 
   return beam;
 }
@@ -238,6 +243,7 @@ Auto_beam_engraver::begin_beam ()
   beaming_options_.from_context (context ());
   beam_settings_ = updated_grob_properties (context (), ly_symbol2scm ("Beam"));
 
+  beam_start_context_.set_context (context ()->get_parent_context ());
   beam_start_moment_ = now_mom ();
   beam_start_location_
     = robust_scm2moment (get_property ("measurePosition"), Moment (0));
@@ -268,17 +274,21 @@ Auto_beam_engraver::end_beam ()
       finished_beam_ = create_beam ();
 
       if (finished_beam_)
-	{
-	  announce_end_grob (finished_beam_, SCM_EOL);
-	  finished_grouping_ = grouping_;
-	  finished_beaming_options_ = beaming_options_;
-	}
+        {
+          Grob_info i = make_grob_info (finished_beam_, SCM_EOL);
+          i.rerouting_daddy_context_ = beam_start_context_.get_context ();
+
+          announce_end_grob (i);
+          finished_grouping_ = grouping_;
+          finished_beaming_options_ = beaming_options_;
+        }
       delete stems_;
       stems_ = 0;
       grouping_ = 0;
       beam_settings_ = SCM_EOL;
     }
 
+  beam_start_context_.set_context (NULL);
   shortest_mom_ = Moment (Rational (1, 4));
 }
 
@@ -288,7 +298,7 @@ Auto_beam_engraver::typeset_beam ()
   if (finished_beam_)
     {
       if (!finished_beam_->get_bound (RIGHT))
-	finished_beam_->set_bound (RIGHT, finished_beam_->get_bound (LEFT));
+        finished_beam_->set_bound (RIGHT, finished_beam_->get_bound (LEFT));
 
       finished_grouping_->beamify (finished_beaming_options_);
       Beam::set_beaming (finished_beam_, finished_grouping_);
@@ -317,7 +327,6 @@ Auto_beam_engraver::finalize ()
     junk_beam ();
 }
 
-
 void
 Auto_beam_engraver::acknowledge_beam (Grob_info /* info */)
 {
@@ -368,14 +377,14 @@ Auto_beam_engraver::acknowledge_stem (Grob_info info)
   if (!Stem::head_count (stem))
     {
       if (stems_)
-	end_beam ();
+        end_beam ();
       return;
     }
 
   if (Stem::get_beam (stem))
     {
       if (stems_)
-	junk_beam ();
+        junk_beam ();
       return;
     }
 
@@ -384,7 +393,7 @@ Auto_beam_engraver::acknowledge_stem (Grob_info info)
   if (durlog <= 2)
     {
       if (stems_)
-	end_beam ();
+        end_beam ();
       return;
     }
 
@@ -395,15 +404,18 @@ Auto_beam_engraver::acknowledge_stem (Grob_info info)
   if (bool (beam_start_location_.grace_part_) != bool (now.grace_part_))
     return;
 
-  Moment dur = unsmob_duration (ev->get_property ("duration"))->get_length ();
+  Duration *stem_duration = unsmob_duration (ev->get_property ("duration"));
+  Moment dur = stem_duration->get_length ();
+
+  //Moment dur = unsmob_duration (ev->get_property ("duration"))->get_length ();
   Moment measure_now = measure_position (context ());
   bool recheck_needed = false;
 
   if (dur < shortest_mom_)
     {
-    /* new shortest moment, so store it and set recheck_needed */
-    shortest_mom_ = dur;
-    recheck_needed = true;
+      /* new shortest moment, so store it and set recheck_needed */
+      shortest_mom_ = dur;
+      recheck_needed = true;
     }
 
   /* end should be based on shortest_mom_, begin should be
@@ -415,8 +427,10 @@ Auto_beam_engraver::acknowledge_stem (Grob_info info)
     return;
 
   grouping_->add_stem (now - beam_start_moment_ + beam_start_location_,
-		       durlog - 2,
-		       Stem::is_invisible (stem));
+                       durlog - 2,
+                       Stem::is_invisible (stem),
+                       stem_duration->factor (),
+                       (stem->get_property ("tuplet-start") == SCM_BOOL_T));
   stems_->push_back (stem);
   last_add_mom_ = now;
   extend_mom_ = max (extend_mom_, now) + get_event_length (ev, now);
@@ -440,7 +454,6 @@ Auto_beam_engraver::recheck_beam ()
 
   bool found_end;
 
-
   for (vsize i = 0; i < stems_->size () - 1;)
     {
       found_end = test_moment (STOP,
@@ -499,7 +512,7 @@ Auto_beam_engraver::remove_end_stems (vsize split_index)
 void
 Auto_beam_engraver::process_acknowledged ()
 {
-  Moment now = now_mom();
+  Moment now = now_mom ();
   if (extend_mom_ > now)
     return;
 
@@ -511,13 +524,13 @@ Auto_beam_engraver::process_acknowledged ()
   else if (process_acknowledged_count_ > 1)
     {
       if (stems_)
-	{
-	  if ((extend_mom_ < now)
-	      || ((extend_mom_ == now) && (last_add_mom_ != now)))
-	    end_beam ();
-	  else if (!stems_->size ())
-	    junk_beam ();
-	}
+        {
+          if ((extend_mom_ < now)
+              || ((extend_mom_ == now) && (last_add_mom_ != now)))
+            end_beam ();
+          else if (!stems_->size ())
+            junk_beam ();
+        }
     }
 
   process_acknowledged_count_++;
@@ -550,4 +563,4 @@ ADD_TRANSLATOR (Auto_beam_engraver,
 
                 /* write */
                 ""
-                );
+               );