release: 1.5.19

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

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index cc3db6529e8f8f1465943bc6b266bcfd3def6d23..8d13e857df326e12807e3a9e9656768513784d2b 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -26,10 +26,7 @@
  */
 class Auto_beam_engraver : public Engraver
 {
-public:
-  Auto_beam_engraver ();
-  VIRTUAL_COPY_CONS (Translator);
-
+  TRANSLATOR_DECLARATIONS(Auto_beam_engraver);
 protected:
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
@@ -64,13 +61,15 @@ private:
   Moment extend_mom_;
   Moment beam_start_moment_;
   Moment beam_start_location_;
+
+  bool subdivide_beams_;
   
   // We act as if beam were created, and start a grouping anyway.
   Beaming_info_list*grouping_p_;  
   Beaming_info_list*finished_grouping_p_;
 };
 
-ADD_THIS_TRANSLATOR (Auto_beam_engraver);
+
 
 Auto_beam_engraver::Auto_beam_engraver ()
 {
@@ -250,8 +249,7 @@ Auto_beam_engraver::begin_beam ()
   grouping_p_ = new Beaming_info_list;
   beam_start_moment_ = now_mom ();
   beam_start_location_ = *unsmob_moment (get_property ("measurePosition"));
-
-
+  subdivide_beams_ = gh_scm2bool(get_property("subdivideBeams")); 
 }
 
 
@@ -294,7 +292,8 @@ Auto_beam_engraver::typeset_beam ()
 {
   if (finished_beam_p_)
     {
-      finished_grouping_p_->beamify ();
+      finished_grouping_p_->beamify(*unsmob_moment (get_property ("beatLength")),
+                                   subdivide_beams_);
       Beam::set_beaming (finished_beam_p_, finished_grouping_p_);
       typeset_grob (finished_beam_p_);
       finished_beam_p_ = 0;
@@ -324,7 +323,6 @@ Auto_beam_engraver::start_translation_timestep ()
 void
 Auto_beam_engraver::stop_translation_timestep ()
 {
-  
   typeset_beam ();
 }
 
@@ -344,23 +342,23 @@ Auto_beam_engraver::acknowledge_grob (Grob_info info)
 {
   if (stem_l_arr_p_)
     {
-      if (Beam::has_interface (info.elem_l_))
+      if (Beam::has_interface (info.grob_l_))
        {
          end_beam ();
        }
-      else if (Bar::has_interface (info.elem_l_))
+      else if (Bar::has_interface (info.grob_l_))
        {
          end_beam ();
        }
-      else if (Rest::has_interface (info.elem_l_))
+      else if (Rest::has_interface (info.grob_l_))
        {
          end_beam ();
        }
     }
   
-  if (Stem::has_interface (info.elem_l_))
+  if (Stem::has_interface (info.grob_l_))
     {
-      Item* stem_l = dynamic_cast<Item *> (info.elem_l_);
+      Item* stem_l = dynamic_cast<Item *> (info.grob_l_);
                                       
       Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.req_l_);
       if (!rhythmic_req)
@@ -474,3 +472,14 @@ Auto_beam_engraver::create_grobs ()
         auto-beam-engraver.cc:459: warning: value computed is not used (gcc: 2.96) */
   count_i_ = count_i_ + 1;
 }
+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.
+",
+/* creats*/       "Beam",
+/* acks  */       "stem-interface rest-interface beam-interface bar-line-interface",
+/* reads */       "noAutoBeaming autoBeamSettings subdivideBeams",
+/* write */       "");