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 94671aabf05b43b3a9dbc2aa418c16d6e2799704..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,19 +61,21 @@ 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 ()
 {
   count_i_ = 0;
   stem_l_arr_p_ = 0;
-  shortest_mom_ = Moment (1, 8);
+  shortest_mom_ = Moment (Rational (1, 8));
   finished_beam_p_ = 0;
   finished_grouping_p_ = 0;
   grouping_p_ = 0;
@@ -109,19 +108,19 @@ Auto_beam_engraver::Auto_beam_engraver ()
 bool
 Auto_beam_engraver::test_moment (Direction dir, Moment test_mom)
 {
-  SCM wild = gh_list (ly_symbol2scm ("*"), ly_symbol2scm ("*"), SCM_UNDEFINED);
+  SCM wild = scm_list_n (ly_symbol2scm ("*"), ly_symbol2scm ("*"), SCM_UNDEFINED);
   SCM function;
   if (dir == START)
-    function = gh_list (ly_symbol2scm ("begin"), SCM_UNDEFINED);
+    function = scm_list_n (ly_symbol2scm ("begin"), SCM_UNDEFINED);
   else
-    function = gh_list (ly_symbol2scm ("end"), SCM_UNDEFINED);
+    function = scm_list_n (ly_symbol2scm ("end"), SCM_UNDEFINED);
 
   Moment one_beat = *unsmob_moment (get_property ("beatLength"));
-  int num = *unsmob_moment (get_property ("measureLength")) / one_beat;
+  int num = int ((*unsmob_moment (get_property ("measureLength")) / one_beat).main_part_);
   int den = one_beat.den ();
-  SCM time = gh_list (gh_int2scm (num), gh_int2scm (den), SCM_UNDEFINED);
+  SCM time = scm_list_n (gh_int2scm (num), gh_int2scm (den), SCM_UNDEFINED);
 
-  SCM type = gh_list (gh_int2scm (test_mom.num ()),
+  SCM type = scm_list_n (gh_int2scm (test_mom.num ()),
                      gh_int2scm (test_mom.den ()), SCM_UNDEFINED);
 
   SCM settings = get_property ("autoBeamSettings");
@@ -144,26 +143,26 @@ 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);
   
-  if (m != SCM_BOOL_F && unsmob_moment (gh_cdr (m)))
-    moment = * unsmob_moment (gh_cdr (m));
+  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);
-  if (m != SCM_BOOL_F && unsmob_moment (gh_cdr (m)))
-    moment = * unsmob_moment (gh_cdr (m));
+  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);
-  if (m != SCM_BOOL_F && unsmob_moment (gh_cdr (m)))
-    moment = * unsmob_moment (gh_cdr (m));
+  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);
-  if (m != SCM_BOOL_F && unsmob_moment (gh_cdr (m)))
-    moment = * unsmob_moment (gh_cdr (m));
+  if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m)))
+    moment = * unsmob_moment (ly_cdr (m));
   
   Rational r;
-  if (moment)
+  if (moment.to_bool ())
     {
       /* Ugh? measurePosition can be negative, when \partial
         We may have to fix this elsewhere (timing translator)
@@ -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")); 
 }
 
 
@@ -265,7 +263,7 @@ Auto_beam_engraver::junk_beam ()
   delete grouping_p_;
   grouping_p_ = 0;
 
-  shortest_mom_ = Moment (1, 8);
+  shortest_mom_ = Moment (Rational (1, 8));
 }
 
 void
@@ -286,7 +284,7 @@ Auto_beam_engraver::end_beam ()
       grouping_p_ = 0;
     }
 
-  shortest_mom_ = Moment (1, 8);
+  shortest_mom_ = Moment (Rational (1, 8));
 }
 
 void
@@ -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)
@@ -399,7 +397,7 @@ Auto_beam_engraver::acknowledge_grob (Grob_info info)
       /*
        ignore grace notes.
        */
-      if (bool (beam_start_location_.grace_mom_) != bool (now_mom ().grace_mom_))
+      if (bool (beam_start_location_.grace_part_) != bool (now_mom ().grace_part_))
        return ;
        
       
@@ -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 */       "");