X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreak-align-item.cc;h=ab9c8058243a383dce31c5561fe132b0b249fe5b;hb=b1aa7f76f1ad7606699fc797161a583df7367013;hp=8fd12ab3b6096355aa32aace57a436cf52a588d3;hpb=f15d80d6507e0d05982cbfa4ca0898c948b2af4b;p=lilypond.git diff --git a/lily/break-align-item.cc b/lily/break-align-item.cc index 8fd12ab3b6..ab9c805824 100644 --- a/lily/break-align-item.cc +++ b/lily/break-align-item.cc @@ -8,6 +8,7 @@ #include "break-align-item.hh" #include "dimensions.hh" +#include "p-score.hh" void Break_align_item::do_pre_processing() @@ -17,9 +18,56 @@ Break_align_item::do_pre_processing() Axis_align_item::do_pre_processing(); } + + + Break_align_item::Break_align_item () { stacking_dir_ = RIGHT; threshold_interval_[SMALLER] = 1.5 PT; set_axis (X_AXIS); } + +void +Break_align_item::add_breakable_item (Item *it) +{ + SCM pr = it->remove_elt_property (break_priority_scm_sym); + + if (pr == SCM_BOOL_F) + return; + + int priority = gh_scm2int (SCM_CDR (pr)); + + Score_element * column_l = get_elt_by_priority (priority); + Axis_group_item * hg=0; + if (column_l) + { + hg = dynamic_cast (column_l); + } + else + { + hg = new Axis_group_item; + hg->set_axes (X_AXIS,X_AXIS); + + /* + this is quite ridiculous, but we do this anyway, to ensure that no + warning bells about missing Y refpoints go off later on. + */ + hg->dim_cache_[Y_AXIS]->parent_l_ = dim_cache_[Y_AXIS]; + hg->set_elt_property (ly_symbol("origin"), + SCM_EOL); + + pscore_l_->typeset_element (hg); + add_element_priority (hg, priority); + + if (priority == 0) + center_l_ = hg; + } + + hg->set_elt_property (ly_symbol("origin"), + scm_cons (gh_str02scm (it->name()), + hg->get_elt_property (ly_symbol ("origin")))); + hg->add_element (it); + + +}