X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeaming-pattern.cc;h=46a46a5d2ea529aa4c1e09836413f4ee0b708d05;hb=4d405ef96a8a62771d7d9a283ff5369a772e89d8;hp=cc569c7c73b696aad614dd2d7344f182803e3dac;hpb=05b311f14f39e5148ca93028a314a0bb2fe0dedd;p=lilypond.git diff --git a/lily/beaming-pattern.cc b/lily/beaming-pattern.cc index cc569c7c73..46a46a5d2e 100644 --- a/lily/beaming-pattern.cc +++ b/lily/beaming-pattern.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1999--2012 Han-Wen Nienhuys + Copyright (C) 1999--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,6 +19,7 @@ #include "context.hh" #include "beaming-pattern.hh" +#include "misc.hh" /* Represents a stem belonging to a beam. Sometimes (for example, if the stem @@ -40,10 +41,11 @@ Beam_rhythmic_element::Beam_rhythmic_element () beam_count_drul_[RIGHT] = 0; invisible_ = false; factor_ = Rational (1); - + tuplet_start_ = false; } -Beam_rhythmic_element::Beam_rhythmic_element (Moment m, int i, bool inv, Rational factor) +Beam_rhythmic_element::Beam_rhythmic_element (Moment m, int i, bool inv, + Rational factor, bool tuplet_start) { start_moment_ = m; rhythmic_importance_ = 0; @@ -51,6 +53,7 @@ Beam_rhythmic_element::Beam_rhythmic_element (Moment m, int i, bool inv, Rationa beam_count_drul_[RIGHT] = i; invisible_ = inv; factor_ = factor; + tuplet_start_ = tuplet_start; } void @@ -160,14 +163,27 @@ Beaming_pattern::beamify (Beaming_options const &options) for (int i = 0; i < 2; i++) for (vsize i = 1; i < infos_.size () - 1; i++) { - Direction non_flag_dir = other_dir (flag_directions[i]); + 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_) - ? 1 : 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)); + 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; } @@ -187,7 +203,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, @@ -207,7 +222,7 @@ find_location (SCM grouping, Moment base_moment, Moment start_moment, while (*next_group_pos < *next_beat_pos) { - int group_count = 1; //default -- 1 base moments in a beam + I64 group_count = 1; //default -- 1 base moments in a beam if (scm_is_pair (grouping)) { group_count = scm_to_int (scm_car (grouping)); @@ -216,17 +231,17 @@ find_location (SCM grouping, Moment base_moment, Moment start_moment, // If we have a tuplet, the count should be determined from // the maximum tuplet size for beamed tuplets. - int tuplet_number = factor.den (); - if (tuplet_number > 1) + U64 tuplet_number = factor.den (); + if (tuplet_number > 1U) { // 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 (); + I64 test_count = ( Moment (Rational (1, 8) / factor) / base_moment).num (); if (test_count > group_count) group_count = test_count; } *group_pos = *next_group_pos; - *next_group_pos = *group_pos + group_count * base_moment; + *next_group_pos = *group_pos + Rational(group_count) * base_moment; } } @@ -237,7 +252,7 @@ Beaming_pattern::find_rhythmic_importance (Beaming_options const &options) Moment next_group_pos (0); Moment next_beat_pos (options.base_moment_); Moment tuplet_start_moment (-1, 1); - int tuplet_number = 1; + I64 tuplet_number = 1; SCM grouping = options.grouping_; vsize i = 0; @@ -268,8 +283,8 @@ 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 - if (tuplet_number == 1 && infos_[i].start_moment_ == next_beat_pos) + // set the beat end and increment the next beat + if (infos_[i].start_moment_ == next_beat_pos) { infos_[i].rhythmic_importance_ = -1; next_beat_pos += options.base_moment_; @@ -280,8 +295,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 (); @@ -326,9 +341,9 @@ Beaming_pattern::unbeam_invisible_stems () } void -Beaming_pattern::add_stem (Moment m, int b, bool invisible, Rational factor) +Beaming_pattern::add_stem (Moment m, int b, bool invisible, Rational factor, bool tuplet_start) { - infos_.push_back (Beam_rhythmic_element (m, b, invisible, factor)); + infos_.push_back (Beam_rhythmic_element (m, b, invisible, factor, tuplet_start)); } Beaming_pattern::Beaming_pattern () @@ -350,11 +365,31 @@ 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_ + + 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; +} - return infos_.at (i).start_moment_ + dur->get_length (); +int +Beaming_pattern::beam_count_for_length (Moment len) const +{ + return intlog2(len.main_part_.den()) - 2 - intlog2(len.main_part_.num()); } bool @@ -369,6 +404,12 @@ Beaming_pattern::factor (int i) const return infos_.at (i).factor_; } +bool +Beaming_pattern::tuplet_start (int i) const +{ + return infos_.at (i).tuplet_start_; +} + /* Split a beaming pattern at index i and return a new Beaming_pattern containing the removed elements @@ -386,7 +427,8 @@ Beaming_pattern::split_pattern (int i) new_pattern->add_stem (start_moment (j), count, invisibility (j), - factor (j)); + factor (j), + tuplet_start (j)); } for (vsize j = i + 1; j < infos_.size ();) infos_.pop_back ();