Direction non_flag_dir = -flag_directions[i];
if (non_flag_dir)
{
- int importance = infos_[i + 1].rhythmic_importance_;
- int start_dur = intlog2(infos_[i+1].start_moment_.main_part_.den());
- int count = (importance < 0 && options.subdivide_beams_)
- ? max(start_dur,3)-2 // 1/8 note has one beam
- : 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));
-
- infos_[i].beam_count_drul_[non_flag_dir] = max(count, 1);
+ 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;
}
}
}
+ 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
{