X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeaming-pattern.cc;h=411b5fbedb8422aeba060159a9dfd7901f6dd3e3;hb=d03ae375a34eaac79b224c4d01bd24749c4c6787;hp=b6b9060ddaeb59a9e3a3ed30782920148cee9919;hpb=743f0d4b067e76d591487f085240a7ff9ace85a7;p=lilypond.git

diff --git a/lily/beaming-pattern.cc b/lily/beaming-pattern.cc
index b6b9060dda..411b5fbedb 100644
--- a/lily/beaming-pattern.cc
+++ b/lily/beaming-pattern.cc
@@ -43,8 +43,8 @@ Beam_rhythmic_element::Beam_rhythmic_element ()
   tuplet_start_ = false;
 }
 
-Beam_rhythmic_element::Beam_rhythmic_element (Moment m, int i, bool inv, 
-  Rational factor, bool tuplet_start)
+Beam_rhythmic_element::Beam_rhythmic_element (Moment m, int i, bool inv,
+                                              Rational factor, bool tuplet_start)
 {
   start_moment_ = m;
   rhythmic_importance_ = 0;
@@ -189,7 +189,6 @@ update_tuplet (Moment start_moment, Rational factor, Moment *tuplet_start_moment
     *tuplet_start_moment = Moment (-1, 1);
 }
 
-
 /*
    Get the group start position, the next group starting position, and the
    next beat starting position, given start_moment, base_moment,
@@ -224,7 +223,7 @@ find_location (SCM grouping, Moment base_moment, Moment start_moment,
           // We use 1/8 as the base moment for the tuplet because it's
           // the largest beamed value.  If the tuplet is shorter, it's
           // OK, the code still works
-          int test_count = ( Moment (Rational (1, 8) / factor ) / base_moment).num ();
+          int test_count = ( Moment (Rational (1, 8) / factor) / base_moment).num ();
           if (test_count > group_count) group_count = test_count;
         }
       *group_pos = *next_group_pos;
@@ -270,16 +269,11 @@ Beaming_pattern::find_rhythmic_importance (Beaming_options const &options)
           Moment tuplet_moment (tuplet);
           Moment tuplet_dt = infos_[i].start_moment_ - tuplet_start_moment;
           tuplet_number = tuplet.den ();
-          // set the beat end (if not in a tuplet) and increment the next beat
+          // set the beat end and increment the next beat
           if (infos_[i].start_moment_ == next_beat_pos)
             {
-              if (tuplet_number == 1)
-                {
-                  infos_[i].rhythmic_importance_ = -1;
-                  next_beat_pos += options.base_moment_;
-                }
-              if (infos_[i].tuplet_start_)
-                infos_[i].rhythmic_importance_ = -1;
+              infos_[i].rhythmic_importance_ = -1;
+              next_beat_pos += options.base_moment_;
             }
           // The rhythmic importance of a stem between beats depends on its fraction
           // of a beat: those stems with a lower denominator are deemed more
@@ -287,8 +281,8 @@ Beaming_pattern::find_rhythmic_importance (Beaming_options const &options)
           // the fraction of the tuplet, instead of the fraction of
           // a beat.
           Moment ratio = (tuplet_number == 1)
-                           ? dt / options.base_moment_
-                           : tuplet_dt / Moment (1, 8)  / tuplet_moment;
+                         ? dt / options.base_moment_
+                         : tuplet_dt / Moment (1, 8) / tuplet_moment;
           if (infos_[i].rhythmic_importance_ >= 0)
             infos_[i].rhythmic_importance_ = (int) ratio.den ();
 
@@ -357,11 +351,12 @@ Beaming_pattern::start_moment (int i) const
 Moment
 Beaming_pattern::end_moment (int i) const
 {
-  Duration *dur = new Duration (2 + max (beamlet_count (i, LEFT),
-                                         beamlet_count (i, RIGHT)),
-                                0);
+  Duration dur (2 + max (beamlet_count (i, LEFT),
+                         beamlet_count (i, RIGHT)),
+                0);
 
-  return infos_.at (i).start_moment_ + dur->get_length ();
+  return infos_.at (i).start_moment_
+         + infos_.at (i).factor_ * dur.get_length ();
 }
 
 bool