release: 1.5.4

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

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 22561d0d24246c5ac7eb6d6245f80f955fc22d8f..781f03393fdf7df09676a2d4d9edf658ce6fd66e 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
@@ -33,7 +33,7 @@ public:
 protected:
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
-  virtual void do_removal_processing ();
+  virtual void finalize ();
   virtual void acknowledge_grob (Grob_info);
   virtual void create_grobs ();
 
@@ -56,9 +56,8 @@ private:
   Link_array<Item>* stem_l_arr_p_;
 
 
-  bool count_i_;
+  int count_i_;
   Moment last_add_mom_;
-
   /*
     Projected ending of the  beam we're working on.
    */
@@ -117,20 +116,20 @@ Auto_beam_engraver::test_moment (Direction dir, Moment test_mom)
   else
     function = gh_list (ly_symbol2scm ("end"), SCM_UNDEFINED);
 
-  Moment one_beat = *unsmob_moment( get_property ("beatLength"));
-  int num = *unsmob_moment (get_property("measureLength")) / one_beat;
-  int den = one_beat.den_i ();
+  Moment one_beat = *unsmob_moment (get_property ("beatLength"));
+  int num = *unsmob_moment (get_property ("measureLength")) / one_beat;
+  int den = one_beat.den ();
   SCM time = gh_list (gh_int2scm (num), gh_int2scm (den), SCM_UNDEFINED);
 
-  SCM type = gh_list (gh_int2scm (test_mom.num_i ()),
-                     gh_int2scm (test_mom.den_i ()), SCM_UNDEFINED);
+  SCM type = gh_list (gh_int2scm (test_mom.num ()),
+                     gh_int2scm (test_mom.den ()), SCM_UNDEFINED);
 
   SCM settings = get_property ("autoBeamSettings");
   
   /* first guess */
   
   /* begin beam at any position
-   (and fallback for end) */
+ (and fallback for end) */
   Moment moment (0);
   
   /* end beam at end of beat */
@@ -165,7 +164,19 @@ Auto_beam_engraver::test_moment (Direction dir, Moment test_mom)
   
   Rational r;
   if (moment)
-    r = unsmob_moment (get_property ("measurePosition"))->mod_rat (moment);
+    {
+      /* Ugh? measurePosition can be negative, when \partial
+        We may have to fix this elsewhere (timing translator)
+       r = unsmob_moment (get_property ("measurePosition"))->mod_rat (moment);
+      */
+      Moment pos = * unsmob_moment (get_property ("measurePosition"));
+      if (pos < Moment (0))
+       {
+         Moment length = * unsmob_moment (get_property ("measureLength"));
+         pos = length - pos;
+       }
+      r = pos.main_part_.mod_rat (moment.main_part_);
+    }
   else
     {
       if (dir == START)
@@ -181,7 +192,7 @@ Auto_beam_engraver::test_moment (Direction dir, Moment test_mom)
 void
 Auto_beam_engraver::consider_begin (Moment test_mom)
 {
-  SCM off = to_boolean (get_property ("noAutoBeaming"));
+  bool off = to_boolean (get_property ("noAutoBeaming"));
   if (!stem_l_arr_p_ && ! off)
     {
       bool b = test_moment (START, test_mom);
@@ -193,7 +204,7 @@ Auto_beam_engraver::consider_begin (Moment test_mom)
 void
 Auto_beam_engraver::consider_end (Moment test_mom)
 {
-  if (stem_l_arr_p_ && stem_l_arr_p_->size () > 1)
+  if (stem_l_arr_p_)
     {
       /* Allow already started autobeam to end:
         don't check for noAutoBeaming */
@@ -206,9 +217,12 @@ Auto_beam_engraver::consider_end (Moment test_mom)
 Spanner*
 Auto_beam_engraver::create_beam_p ()
 {
+  if (to_boolean (get_property ("skipTypesetting")))
+    {
+     return 0;
+    }
+  
   Spanner* beam_p = new Spanner (get_property ("Beam"));
-  Beam::set_interface (beam_p);
-
   for (int i = 0; i < stem_l_arr_p_->size (); i++)
     {
       /*
@@ -216,10 +230,10 @@ Auto_beam_engraver::create_beam_p ()
        */
       if (Stem::beam_l ((*stem_l_arr_p_)[i]))
        {
-         scm_unprotect_object (beam_p->self_scm ());
+         scm_gc_unprotect_object (beam_p->self_scm ());
          return 0;
        }
-      Beam::add_stem (beam_p,(*stem_l_arr_p_)[i]);
+      Beam::add_stem (beam_p, (*stem_l_arr_p_)[i]);
     }
   
   announce_grob (beam_p, 0);
@@ -236,6 +250,8 @@ Auto_beam_engraver::begin_beam ()
   grouping_p_ = new Beaming_info_list;
   beam_start_moment_ = now_mom ();
   beam_start_location_ = *unsmob_moment (get_property ("measurePosition"));
+
+
 }
 
 
@@ -248,6 +264,7 @@ Auto_beam_engraver::junk_beam ()
   stem_l_arr_p_ = 0;
   delete grouping_p_;
   grouping_p_ = 0;
+
   shortest_mom_ = Moment (1, 8);
 }
 
@@ -259,6 +276,7 @@ Auto_beam_engraver::end_beam ()
       junk_beam ();
     }
   else
+    
     {
       finished_beam_p_ = create_beam_p ();
       if (finished_beam_p_)
@@ -266,8 +284,9 @@ Auto_beam_engraver::end_beam ()
       delete stem_l_arr_p_;
       stem_l_arr_p_ = 0;
       grouping_p_ = 0;
-      shortest_mom_ = Moment (1, 8);
     }
+
+  shortest_mom_ = Moment (1, 8);
 }
 
 void
@@ -310,7 +329,7 @@ Auto_beam_engraver::stop_translation_timestep ()
 }
 
 void
-Auto_beam_engraver::do_removal_processing ()
+Auto_beam_engraver::finalize ()
 {
   /* finished beams may be typeset */
   typeset_beam ();
@@ -319,20 +338,10 @@ Auto_beam_engraver::do_removal_processing ()
     junk_beam ();
 }
 
-bool
-Auto_beam_engraver::same_grace_state_b (Grob* e)
-{
-  bool gr = e->get_grob_property ("grace") == SCM_BOOL_T;
-  SCM wg =get_property ("weAreGraceContext");
-  return (to_boolean (wg)) == gr;
-}
 
 void
 Auto_beam_engraver::acknowledge_grob (Grob_info info)
 {
-  if (!same_grace_state_b (info.elem_l_))
-    return;
-  
   if (stem_l_arr_p_)
     {
       if (Beam::has_interface (info.elem_l_))
@@ -386,6 +395,14 @@ Auto_beam_engraver::acknowledge_grob (Grob_info info)
          return;
        }
 
+
+      /*
+       ignore grace notes.
+       */
+      if (bool (beam_start_location_.grace_part_) != bool (now_mom ().grace_part_))
+       return ;
+       
+      
       Moment dur = unsmob_duration (rhythmic_req->get_mus_property ("duration"))->length_mom ();
       /* FIXME:
 
@@ -396,7 +413,6 @@ Auto_beam_engraver::acknowledge_grob (Grob_info info)
 
        but the code didn't match: */
 #if 1
-      
       consider_end (dur);
       consider_begin (dur);
 
@@ -423,7 +439,7 @@ Auto_beam_engraver::acknowledge_grob (Grob_info info)
                             durlog - 2);
       stem_l_arr_p_->push (stem_l);
       last_add_mom_ = now;
-      extend_mom_ = extend_mom_ >? now + rhythmic_req->length_mom ();
+      extend_mom_ = (extend_mom_ >? now) + rhythmic_req->length_mom ();
     }
 }
 
@@ -441,7 +457,7 @@ Auto_beam_engraver::create_grobs ()
        {
          Moment now = now_mom ();
          if ((extend_mom_ < now)
-             || ((extend_mom_ == now) && (last_add_mom_ != now )))
+             || ((extend_mom_ == now) && (last_add_mom_ != now)))
            {
              end_beam ();
            }
@@ -453,8 +469,8 @@ Auto_beam_engraver::create_grobs ()
     }
 
   /*
-    Ugh.
-    gcc: 2.95.3-2c (latest and greatest from Franz Sirl for ppc)
-    auto-beam-engraver.cc:459: warning: value computed is not used */
-  count_i_++;
+    count_i_++ -> 
+
+        auto-beam-engraver.cc:459: warning: value computed is not used (gcc: 2.96) */
+  count_i_ = count_i_ + 1;
 }