X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fauto-beam-engraver.cc;h=f98f5a110a68e420455afb2870747eff4cfde0d7;hb=4df5d02c83e4259e8713cc5c22f0abd33b9303d6;hp=6c1684fba2dfe810a055936814068596ff6fc779;hpb=b4d2043223a86826764bc531e684a864c97605fe;p=lilypond.git

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 6c1684fba2..f98f5a110a 100644
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -3,24 +3,24 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "engraver.hh"
-#include "beaming.hh"
-#include "beam.hh"
-#include "stem.hh"
-#include "warn.hh"
 #include "bar-line.hh"
-#include "rest.hh"
-#include "item.hh"
-#include "spanner.hh"
+#include "beaming-pattern.hh"
+#include "beam.hh"
 #include "context.hh"
 #include "duration.hh"
+#include "engraver.hh"
+#include "item.hh"
+#include "rest.hh"
+#include "spanner.hh"
+#include "stream-event.hh"
+#include "stem.hh"
+#include "warn.hh"
 
 #include "translator.icc"
 
-
 class Auto_beam_engraver : public Engraver
 {
   TRANSLATOR_DECLARATIONS (Auto_beam_engraver);
@@ -29,15 +29,15 @@ protected:
   void stop_translation_timestep ();
   void start_translation_timestep ();
   void process_music ();
-  virtual bool try_music (Music *);
   virtual void finalize ();
   virtual void derived_mark () const;
-  
+
   DECLARE_ACKNOWLEDGER (rest);
   DECLARE_ACKNOWLEDGER (beam);
   DECLARE_ACKNOWLEDGER (bar_line);
   DECLARE_ACKNOWLEDGER (stem);
-  
+  DECLARE_TRANSLATOR_LISTENER (beam_forbid);
+
   void process_acknowledged ();
 
 private:
@@ -51,13 +51,13 @@ private:
   bool is_same_grace_state (Grob *e);
   void typeset_beam ();
 
-  Music *forbid_;
+  Stream_event *forbid_;
   /*
     shortest_mom is the shortest note in the beam.
   */
   Moment shortest_mom_;
   Spanner *finished_beam_;
-  Link_array<Item> *stems_;
+  vector<Item*> *stems_;
 
   int process_acknowledged_count_;
   Moment last_add_mom_;
@@ -72,22 +72,20 @@ private:
   Moment beat_length_;
 
   // We act as if beam were created, and start a grouping anyway.
-  Beaming_info_list *grouping_;
+  Beaming_pattern *grouping_;
   SCM beam_settings_;
 
-  Beaming_info_list *finished_grouping_;
+  Beaming_pattern *finished_grouping_;
 
   void check_bar_property ();
 };
 
-
 void
 Auto_beam_engraver::derived_mark () const
 {
   scm_gc_mark (beam_settings_);
 }
 
-
 void
 Auto_beam_engraver::check_bar_property ()
 {
@@ -131,16 +129,11 @@ Auto_beam_engraver::Auto_beam_engraver ()
   beam_settings_ = SCM_EOL;
 }
 
-bool
-Auto_beam_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Auto_beam_engraver, beam_forbid);
+void
+Auto_beam_engraver::listen_beam_forbid (Stream_event *ev)
 {
-  if (m->is_mus_type ("beam-forbid-event"))
-    {
-      forbid_ = m;
-      return true;
-    }
-
-  return false;
+  ASSIGN_EVENT_ONCE (forbid_, ev);
 }
 
 bool
@@ -152,7 +145,7 @@ Auto_beam_engraver::test_moment (Direction dir, Moment test)
 		     test.smobbed_copy ())
     != SCM_BOOL_F;
 }
-    
+
 void
 Auto_beam_engraver::consider_begin (Moment test_mom)
 {
@@ -185,18 +178,18 @@ Auto_beam_engraver::create_beam ()
   if (to_boolean (get_property ("skipTypesetting")))
     return 0;
 
-  for (int i = 0; i < stems_->size (); i++)
+  for (vsize i = 0; i < stems_->size (); i++)
     if (Stem::get_beam ((*stems_)[i]))
       return 0;
 
   /*
     Can't use make_spanner_from_properties() because we have to use
     beam_settings_.
-   */
+  */
   Spanner *beam = new Spanner (beam_settings_,
 			       context ()->get_grob_key ("Beam"));
 
-  for (int i = 0; i < stems_->size (); i++)
+  for (vsize i = 0; i < stems_->size (); i++)
     Beam::add_stem (beam, (*stems_)[i]);
 
   announce_grob (beam, (*stems_)[0]->self_scm ());
@@ -213,15 +206,13 @@ Auto_beam_engraver::begin_beam ()
       return;
     }
 
-  stems_ = new Link_array<Item>;
-  grouping_ = new Beaming_info_list;
+  stems_ = new vector<Item*>;
+  grouping_ = new Beaming_pattern ();
   beam_settings_ = updated_grob_properties (context (), ly_symbol2scm ("Beam"));
 
   beam_start_moment_ = now_mom ();
   beam_start_location_
     = robust_scm2moment (get_property ("measurePosition"), Moment (0));
-  subdivide_beams_ = ly_scm2bool (get_property ("subdivideBeams"));
-  beat_length_ = robust_scm2moment (get_property ("beatLength"), Moment (1, 4));
 }
 
 void
@@ -243,14 +234,16 @@ void
 Auto_beam_engraver::end_beam ()
 {
   if (stems_->size () < 2)
-    {
-      junk_beam ();
-    }
+    junk_beam ();
   else
     {
       finished_beam_ = create_beam ();
+      
       if (finished_beam_)
-	finished_grouping_ = grouping_;
+	{
+	  announce_end_grob (finished_beam_, SCM_EOL);
+	  finished_grouping_ = grouping_;
+	}
       delete stems_;
       stems_ = 0;
       grouping_ = 0;
@@ -265,7 +258,10 @@ Auto_beam_engraver::typeset_beam ()
 {
   if (finished_beam_)
     {
-      finished_grouping_->beamify (beat_length_, subdivide_beams_);
+      if (!finished_beam_->get_bound (RIGHT))
+	finished_beam_->set_bound (RIGHT, finished_beam_->get_bound (LEFT));
+      
+      finished_grouping_->beamify (context ());
       Beam::set_beaming (finished_beam_, finished_grouping_);
       finished_beam_ = 0;
 
@@ -285,9 +281,7 @@ Auto_beam_engraver::start_translation_timestep ()
     {
       Moment now = now_mom ();
       if (extend_mom_ < now)
-	{
-	  end_beam ();
-	}
+	end_beam ();
     }
   forbid_ = 0;
 }
@@ -309,19 +303,15 @@ Auto_beam_engraver::finalize ()
 }
 
 
-
-
 void
 Auto_beam_engraver::acknowledge_beam (Grob_info info)
 {
   (void)info;
   check_bar_property ();
   if (stems_)
-    {
-      end_beam ();
-    }
+    end_beam ();
 }
- 
+
 void
 Auto_beam_engraver::acknowledge_bar_line (Grob_info info)
 {
@@ -345,8 +335,8 @@ Auto_beam_engraver::acknowledge_stem (Grob_info info)
 {
   check_bar_property ();
   Item *stem = dynamic_cast<Item *> (info.grob ());
-  Music *m = info.music_cause ();
-  if (!m->is_mus_type ("rhythmic-event"))
+  Stream_event *ev = info.ultimate_event_cause ();
+  if (!ev->in_event_class ("rhythmic-event"))
     {
       programming_error ("stem must have rhythmic structure");
       return;
@@ -369,7 +359,7 @@ Auto_beam_engraver::acknowledge_stem (Grob_info info)
       return;
     }
 
-  int durlog = unsmob_duration (m->get_property ("duration"))->duration_log ();
+  int durlog = unsmob_duration (ev->get_property ("duration"))->duration_log ();
 
   if (durlog <= 2)
     {
@@ -385,7 +375,7 @@ Auto_beam_engraver::acknowledge_stem (Grob_info info)
   if (bool (beam_start_location_.grace_part_) != bool (now.grace_part_))
     return;
 
-  Moment dur = unsmob_duration (m->get_property ("duration"))->get_length ();
+  Moment dur = unsmob_duration (ev->get_property ("duration"))->get_length ();
 
   consider_end (dur);
   consider_begin (dur);
@@ -398,16 +388,16 @@ Auto_beam_engraver::acknowledge_stem (Grob_info info)
 
   grouping_->add_stem (now - beam_start_moment_ + beam_start_location_,
 		       durlog - 2);
-  stems_->push (stem);
+  stems_->push_back (stem);
   last_add_mom_ = now;
-  extend_mom_ = max (extend_mom_, now) + m->get_length ();
+  extend_mom_ = max (extend_mom_, now) + get_event_length (ev);
 }
 
 void
 Auto_beam_engraver::process_acknowledged ()
 {
   if (extend_mom_ > now_mom ())
-    return ; 
+    return;
 
   if (!process_acknowledged_count_)
     {
@@ -421,30 +411,31 @@ Auto_beam_engraver::process_acknowledged ()
 	  Moment now = now_mom ();
 	  if ((extend_mom_ < now)
 	      || ((extend_mom_ == now) && (last_add_mom_ != now)))
-	    {
-	      end_beam ();
-	    }
+	    end_beam ();
 	  else if (!stems_->size ())
-	    {
-	      junk_beam ();
-	    }
+	    junk_beam ();
 	}
     }
 
   process_acknowledged_count_++;
 }
 
-ADD_ACKNOWLEDGER (Auto_beam_engraver,stem);
-ADD_ACKNOWLEDGER (Auto_beam_engraver,bar_line);
-ADD_ACKNOWLEDGER (Auto_beam_engraver,beam);
-ADD_ACKNOWLEDGER (Auto_beam_engraver,rest);
+ADD_ACKNOWLEDGER (Auto_beam_engraver, stem);
+ADD_ACKNOWLEDGER (Auto_beam_engraver, bar_line);
+ADD_ACKNOWLEDGER (Auto_beam_engraver, beam);
+ADD_ACKNOWLEDGER (Auto_beam_engraver, rest);
 ADD_TRANSLATOR (Auto_beam_engraver,
-		/* descr */ "Generate beams based on measure characteristics and observed "
+		/* doc */ "Generate beams based on measure characteristics and observed "
 		"Stems.  Uses beatLength, measureLength and measurePosition to decide "
 		"when to start and stop a beam.  Overriding beaming is done through "
 		"@ref{Stem_engraver} properties @code{stemLeftBeamCount} and "
 		"@code{stemRightBeamCount}. ",
-		/* creats*/ "Beam",
-		/* accepts */ "beam-forbid-event",
-		/* reads */ "autoBeaming autoBeamSettings beatLength subdivideBeams",
+		/* create */ "Beam",
+
+		/* read */
+		"autoBeaming "
+		"autoBeamSettings "
+		"beatLength "
+		"subdivideBeams ",
+		
 		/* write */ "");