X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeaming-pattern.cc;h=46a46a5d2ea529aa4c1e09836413f4ee0b708d05;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=53a8c354ea162d5e28d792f5e18bb0192b61e944;hpb=cb0b407e567feca71cbc5f9479a06b266c69a26c;p=lilypond.git

diff --git a/lily/beaming-pattern.cc b/lily/beaming-pattern.cc
index 53a8c354ea..46a46a5d2e 100644
--- a/lily/beaming-pattern.cc
+++ b/lily/beaming-pattern.cc
@@ -21,8 +21,6 @@
 #include "beaming-pattern.hh"
 #include "misc.hh"
 
-using std::vector;
-
 /*
   Represents a stem belonging to a beam. Sometimes (for example, if the stem
   belongs to a rest and stemlets aren't used) the stem will be invisible.
@@ -134,8 +132,6 @@ Beaming_pattern::beamify (Beaming_options const &options)
   if (infos_.size () <= 1)
     return;
 
-  int subdivide_beam_count = intlog2(options.base_moment_.main_part_.den())-2;
-
   unbeam_invisible_stems ();
 
   if (infos_[0].start_moment_.grace_part_)
@@ -170,12 +166,24 @@ Beaming_pattern::beamify (Beaming_options const &options)
         Direction non_flag_dir = -flag_directions[i];
         if (non_flag_dir)
           {
-            int importance = infos_[i + 1].rhythmic_importance_;
-            int count = (importance < 0 && options.subdivide_beams_) 
-                        ? subdivide_beam_count
-                        : std::min (std::min (infos_[i].count (non_flag_dir),
-                                        infos_[i + non_flag_dir].count (-non_flag_dir)),
-                                   infos_[i - non_flag_dir].count (non_flag_dir));
+            int count =
+                (infos_[i + 1].rhythmic_importance_ < 0 &&
+                 options.subdivide_beams_)
+                        // we're left of a subdivision
+                ?  (i != infos_.size () - 2)
+                   // respect the beam count for shortened beams ...
+                   ? max (beam_count_for_rhythmic_position (i + 1),
+                          beam_count_for_length (remaining_length (i + 1)))
+                   // ... except if there's only one trailing stem
+                   : beam_count_for_rhythmic_position (i + 1)
+
+                // we're at any other stem
+                : min (min (infos_[i].count (non_flag_dir),
+                            infos_[i + non_flag_dir].count (-non_flag_dir)),
+                       infos_[i - non_flag_dir].count (non_flag_dir));
+
+            // Ensure at least one beam is left, even for groups longer than 1/8
+            count = max (count, 1);
 
             infos_[i].beam_count_drul_[non_flag_dir] = count;
           }
@@ -317,7 +325,7 @@ Beaming_pattern::unbeam_invisible_stems ()
   for (vsize i = 1; i < infos_.size (); i++)
     if (infos_[i].invisible_)
       {
-        int b = std::min (infos_[i].count (LEFT), infos_[i - 1].count (LEFT));
+        int b = min (infos_[i].count (LEFT), infos_[i - 1].count (LEFT));
         infos_[i].beam_count_drul_[LEFT] = b;
         infos_[i].beam_count_drul_[RIGHT] = b;
       }
@@ -326,7 +334,7 @@ Beaming_pattern::unbeam_invisible_stems ()
     for (vsize i = infos_.size () - 1; i--;)
       if (infos_[i].invisible_)
         {
-          int b = std::min (infos_[i].count (LEFT), infos_[i + 1].count (LEFT));
+          int b = min (infos_[i].count (LEFT), infos_[i + 1].count (LEFT));
           infos_[i].beam_count_drul_[LEFT] = b;
           infos_[i].beam_count_drul_[RIGHT] = b;
         }
@@ -357,7 +365,7 @@ Beaming_pattern::start_moment (int i) const
 Moment
 Beaming_pattern::end_moment (int i) const
 {
-  Duration dur (2 + std::max (beamlet_count (i, LEFT),
+  Duration dur (2 + max (beamlet_count (i, LEFT),
                          beamlet_count (i, RIGHT)),
                 0);
 
@@ -365,6 +373,25 @@ Beaming_pattern::end_moment (int i) const
          + infos_.at (i).factor_ * dur.get_length ();
 }
 
+Moment
+Beaming_pattern::remaining_length (int i) const
+{
+    return end_moment (infos_.size () - 1) - infos_[i].start_moment_;
+}
+
+int
+Beaming_pattern::beam_count_for_rhythmic_position (int idx) const
+{
+    // Calculate number of beams representing the rhythmic position of given stem
+    return intlog2(infos_[idx].start_moment_.main_part_.den()) - 2;
+}
+
+int
+Beaming_pattern::beam_count_for_length (Moment len) const
+{
+    return intlog2(len.main_part_.den()) - 2 - intlog2(len.main_part_.num());
+}
+
 bool
 Beaming_pattern::invisibility (int i) const
 {
@@ -396,7 +423,7 @@ Beaming_pattern::split_pattern (int i)
   new_pattern = new Beaming_pattern ();
   for (vsize j = i + 1; j < infos_.size (); j++)
     {
-      count = std::max (beamlet_count (j, LEFT), beamlet_count (j, RIGHT));
+      count = max (beamlet_count (j, LEFT), beamlet_count (j, RIGHT));
       new_pattern->add_stem (start_moment (j),
                              count,
                              invisibility (j),