* lily/script-engraver.cc (make_script_from_event): don't crash on

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

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index bce4eac95687ba275dcee37e064f11bd02341b0b..42e3935d8de364475545a473d8ad6fff3931cadb 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -3,12 +3,12 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2003 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
 #include "beaming.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "beam.hh"
 #include "stem.hh"
 #include "warn.hh"
@@ -18,6 +18,7 @@
 #include "engraver.hh"
 #include "item.hh"
 #include "spanner.hh"
+#include "duration.hh"
 
 /*
   TODO: figure what to do in grace?
@@ -30,6 +31,7 @@ class Auto_beam_engraver : public Engraver
 protected:
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
+  virtual void process_music ();
   virtual void finalize ();
   virtual void acknowledge_grob (Grob_info);
   virtual void process_acknowledged_grobs ();
@@ -72,6 +74,15 @@ private:
   Beaming_info_list*finished_grouping_;
 };
 
+void
+Auto_beam_engraver::process_music ()
+{
+  if (gh_string_p (get_property ("whichBar")))
+    {
+      consider_end (shortest_mom_);
+      junk_beam ();
+    }
+}
 
 
 Auto_beam_engraver::Auto_beam_engraver ()
@@ -152,23 +163,23 @@ Auto_beam_engraver::test_moment (Direction dir, Moment test_mom)
     }
 
   /* second guess: property generic time exception */
-  SCM m = gh_assoc (gh_append3 (function, wild, time), settings);
+  SCM m = scm_assoc (gh_append3 (function, wild, time), settings);
   
   if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m)))
     moment = * unsmob_moment (ly_cdr (m));
 
   /* third guess: property time exception, specific for duration type */
-  m = gh_assoc (gh_append3 (function, type, time), settings);
+  m = scm_assoc (gh_append3 (function, type, time), settings);
   if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m)))
     moment = * unsmob_moment (ly_cdr (m));
 
   /* fourth guess [user override]: property plain generic */
-  m = gh_assoc (gh_append3 (function, wild, wild), settings);
+  m = scm_assoc (gh_append3 (function, wild, wild), settings);
   if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m)))
     moment = * unsmob_moment (ly_cdr (m));
 
   /* fifth guess [user override]: property plain, specific for duration type */
-  m = gh_assoc (gh_append3 (function, type, wild), settings);
+  m = scm_assoc (gh_append3 (function, type, wild), settings);
   if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m)))
     moment = * unsmob_moment (ly_cdr (m));
   
@@ -255,9 +266,13 @@ Auto_beam_engraver::create_beam ()
 void
 Auto_beam_engraver::begin_beam ()
 {
-  assert (!stems_);
+  if (stems_ || grouping_ )
+    {
+      programming_error ("already have autobeam");
+      return; 
+    }
+  
   stems_ = new Link_array<Item>;
-  assert (!grouping_);
   grouping_ = new Beaming_info_list;
   beam_settings_ = get_property ("Beam");
   
@@ -267,11 +282,11 @@ Auto_beam_engraver::begin_beam ()
   beat_length_ = *unsmob_moment (get_property ("beatLength"));
 }
 
-
 void
 Auto_beam_engraver::junk_beam () 
 {
-  assert (stems_);
+  if (!stems_)
+    return ;
   
   delete stems_;
   stems_ = 0;
@@ -290,7 +305,6 @@ Auto_beam_engraver::end_beam ()
       junk_beam ();
     }
   else
-    
     {
       finished_beam_ = create_beam ();
       if (finished_beam_)
@@ -375,9 +389,8 @@ Auto_beam_engraver::acknowledge_grob (Grob_info info)
   if (Stem::has_interface (info.grob_))
     {
       Item* stem = dynamic_cast<Item *> (info.grob_);
-                                      
-      Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.music_cause ());
-      if (!rhythmic_req)
+      Music* m = info.music_cause ();
+      if (!m->is_mus_type ("rhythmic-event"))
        {
          programming_error ("Stem must have rhythmic structure");
          return;
@@ -400,7 +413,7 @@ Auto_beam_engraver::acknowledge_grob (Grob_info info)
          return ;
        }
              
-      int durlog  = unsmob_duration (rhythmic_req->get_mus_property ("duration"))->duration_log ();
+      int durlog  = unsmob_duration (m->get_mus_property ("duration"))->duration_log ();
       
       if (durlog <= 2)
        {
@@ -417,7 +430,7 @@ Auto_beam_engraver::acknowledge_grob (Grob_info info)
        return ;
        
       
-      Moment dur = unsmob_duration (rhythmic_req->get_mus_property ("duration"))->length_mom ();
+      Moment dur = unsmob_duration (m->get_mus_property ("duration"))->get_length ();
       /* FIXME:
 
        This comment has been here since long:
@@ -453,7 +466,7 @@ Auto_beam_engraver::acknowledge_grob (Grob_info info)
                             durlog - 2);
       stems_->push (stem);
       last_add_mom_ = now;
-      extend_mom_ = (extend_mom_ >? now) + rhythmic_req->length_mom ();
+      extend_mom_ = (extend_mom_ >? now) + m->get_length ();
     }
 }
 
@@ -481,22 +494,19 @@ Auto_beam_engraver::process_acknowledged_grobs ()
            }
        }    
     }
-
-  /*
-    count_++ -> 
-
-        auto-beam-engraver.cc:459: warning: value computed is not used (gcc: 2.96) */
-  count_ = count_ + 1;
+  
+  count_ ++;
 }
 
 ENTER_DESCRIPTION (Auto_beam_engraver,
-/* descr */       "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 stemLeftBeamCount and
-stemRightBeamCount.
-",
+/* descr */       "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 stemLeftBeamCount and "
+"stemRightBeamCount. "
+,
 /* creats*/       "Beam",
-/* acks  */       "stem-interface rest-interface beam-interface bar-line-interface",
+/* accepts */     "",
+/* acks  */      "stem-interface rest-interface beam-interface bar-line-interface",
 /* reads */       "autoBeaming autoBeamSettings beatLength subdivideBeams",
 /* write */       "");