X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=611af4125c353adb203479ed80971bbdf00fcce2;hb=eac874ad80855c7f8372c7893394fd63371a7be1;hp=4c2719a91fbdb512dfba0d3c5c21e2c50956c5c7;hpb=b5603acc6faf05c541353bf2154d73986e2bee0b;p=lilypond.git diff --git a/lily/paper-score.cc b/lily/paper-score.cc index 4c2719a91f..611af4125c 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -69,26 +69,24 @@ Paper_score::typeset_system (System *system) system->unprotect (); } - -vector +void Paper_score::find_break_indices () const { - vector all = root_system ()->used_columns (); - vector retval; + cols_ = root_system ()->used_columns (); + break_indices_.clear (); + break_ranks_.clear (); - for (vsize i = 0; i < all.size (); i++) + for (vsize i = 0; i < cols_.size (); i++) { - Item *it = dynamic_cast (all[i]); - if (Paper_column::is_breakable (all[i]) + Item *it = dynamic_cast (cols_[i]); + if (Paper_column::is_breakable (cols_[i]) && (i == 0 || it->find_prebroken_piece (LEFT)) - && (i == all.size () - 1 || it->find_prebroken_piece (RIGHT))) - retval.push_back (i); + && (i == cols_.size () - 1 || it->find_prebroken_piece (RIGHT))) + { + break_indices_.push_back (i); + break_ranks_.push_back (it->get_column ()->get_rank ()); + } } - - cols_ = all; - break_indices_ = retval; - - return retval; } vector @@ -107,6 +105,14 @@ Paper_score::get_columns () const return cols_; } +vector +Paper_score::get_break_ranks () const +{ + if (break_ranks_.empty ()) + find_break_indices (); + return break_ranks_; +} + vector Paper_score::calc_breaking () {