''

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

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index 7b506953c8eb1904381b761bbffae8119f0462a5..904945439700aeeee98b35240d6daeaa20838ccb 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "engraver-group-engraver.hh"
@@ -22,9 +22,6 @@
 class Beam_engraver : public Engraver
 {
   Drul_array<Span_req*> reqs_drul_;
-
-  Link_array<Stem> stems_;
-  
   
   Spanner *finished_beam_p_;
   Spanner *beam_p_;
@@ -38,21 +35,22 @@ class Beam_engraver : public Engraver
 
   /// moment (global time) where beam started.
   Moment beam_start_mom_;
-  
+
+  bool subdivide_beams_;
+
   void typeset_beam ();
   void set_melisma (bool);
 protected:
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
   virtual void finalize ();
-  virtual void create_grobs ();
+
   virtual void acknowledge_grob (Grob_info);
   virtual bool try_music (Music*);
   virtual void process_music ();
 
 public:
-  Beam_engraver ();
-  VIRTUAL_COPY_CONS (Translator);
+  TRANSLATOR_DECLARATIONS(  Beam_engraver );
 };
 
 
@@ -64,6 +62,7 @@ Beam_engraver::Beam_engraver ()
   beam_info_p_ =0;
   reqs_drul_[LEFT] = reqs_drul_[RIGHT] =0;
   prev_start_req_ =0;
+  
 }
 
 bool
@@ -86,17 +85,11 @@ Beam_engraver::try_music (Music *m)
       
          Direction d =c->get_span_dir ();
 
-         if (d == STOP && !beam_p_)
-           {
-             m->origin ()->warning (_ ("can't find start of beam"));
-             return false;
-           }
-
          if (d == STOP)
            {
              SCM m = get_property ("automaticMelismata");
-             SCM b = get_property ("noAutoBeaming");
-             if (to_boolean (m) && to_boolean (b))
+             SCM b = get_property ("autoBeaming");
+             if (to_boolean (m) && !to_boolean (b))
                {
                  set_melisma (false);
                }
@@ -133,24 +126,8 @@ Beam_engraver::process_music ()
 
   if (beam_p_)
     {
-      Score_engraver * e = 0;
-      Translator * t  =  daddy_grav_l ();
-      for (; !e && t;  t = t->daddy_trans_l_)
-       {
-         e = dynamic_cast<Score_engraver*> (t);
-       }
-      
-      if (!e)
-       programming_error ("No score engraver!");
-      else
-       e->forbid_breaks ();
+      top_engraver ()->forbid_breaks ();
     }
-}
-
-
-void
-Beam_engraver::create_grobs ()
-{
   if (reqs_drul_[START])
     {
       if (beam_p_)
@@ -171,26 +148,25 @@ Beam_engraver::create_grobs ()
       
       /* urg, must copy to Auto_beam_engraver too */
  
-      announce_grob (beam_p_, reqs_drul_[START]);
+      announce_grob(beam_p_, reqs_drul_[START]->self_scm());
     }
-  reqs_drul_[STOP] = 0;
-  reqs_drul_[START] = 0;
+
 }
 
+
 void
 Beam_engraver::typeset_beam ()
 {
   if (finished_beam_p_)
     {
-      finished_beam_info_p_->beamify ();
-      
+      finished_beam_info_p_->beamify(*unsmob_moment (get_property ("beatLength")),
+                                    subdivide_beams_);
+
       Beam::set_beaming (finished_beam_p_, finished_beam_info_p_);
       typeset_grob (finished_beam_p_);
       delete finished_beam_info_p_;
       finished_beam_info_p_ =0;
       finished_beam_p_ = 0;
-    
-      reqs_drul_[STOP] = 0;
     }
 }
 
@@ -198,13 +174,18 @@ void
 Beam_engraver::start_translation_timestep ()
 {
   reqs_drul_ [START] =0;
-  if (beam_p_) {
-    SCM m = get_property ("automaticMelismata");
-    SCM b = get_property ("noAutoBeaming");
-    if (to_boolean (m) && to_boolean (b)) {
-      set_melisma (true);
+  reqs_drul_[STOP] = 0;
+  
+  if (beam_p_)
+    {
+      SCM m = get_property ("automaticMelismata");
+      SCM b = get_property ("autoBeaming");
+      if (to_boolean (m) && !to_boolean (b))
+       {
+         set_melisma (true);
+       }
+      subdivide_beams_ = to_boolean(get_property("subdivideBeams")); 
     }
-  }
 }
 
 void
@@ -234,27 +215,27 @@ Beam_engraver::acknowledge_grob (Grob_info info)
 {
   if (beam_p_)
     {
-      if (Rest::has_interface (info.elem_l_))
+      if (Rest::has_interface (info.grob_l_))
        {
-         info.elem_l_->add_offset_callback (Beam::rest_collision_callback_proc, Y_AXIS);
+         info.grob_l_->add_offset_callback (Beam::rest_collision_callback_proc, Y_AXIS);
        }
-      else if (Stem::has_interface (info.elem_l_))
+      else if (Stem::has_interface (info.grob_l_))
        {
          Moment now = now_mom();
 
-         if(bool (now.grace_mom_ ) != bool (beam_start_mom_.grace_mom_))
+         if(bool (now.grace_part_ ) != bool (beam_start_mom_.grace_part_))
            return ;
          
-         Item *stem_l = dynamic_cast<Item*> (info.elem_l_);
+         Item *stem_l = dynamic_cast<Item*> (info.grob_l_);
          if (Stem::beam_l (stem_l))
            return;
 
-         Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.req_l_);
+         Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.music_cause ());
          if (!rhythmic_req)
            {
              String s = _ ("stem must have Rhythmic structure");
-             if (info.req_l_)
-               info.req_l_->origin ()->warning (s);
+             if (info.music_cause ())
+               info.music_cause ()->origin ()->warning (s);
              else
                ::warning (s);
          
@@ -277,7 +258,7 @@ Beam_engraver::acknowledge_grob (Grob_info info)
                                    gh_int2scm (durlog));
          Moment stem_location = now - beam_start_mom_ + beam_start_location_;
          beam_info_p_->add_stem (stem_location,
- (durlog- 2) >? 1);
+ (durlog- 2) >? 0);
          Beam::add_stem (beam_p_, stem_l);
        }
     }
@@ -285,5 +266,12 @@ Beam_engraver::acknowledge_grob (Grob_info info)
 
 
 
-ADD_THIS_TRANSLATOR (Beam_engraver);
 
+
+ENTER_DESCRIPTION(Beam_engraver,
+/* descr */       "Handles Beam_requests by engraving Beams.    If omitted, then notes will be
+printed with flags instead of beams.",
+/* creats*/       "Beam",
+/* acks  */       "stem-interface rest-interface",
+/* reads */       "beamMelismaBusy subdivideBeams",
+/* write */       "");