X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-column-engraver.cc;h=6dd29300130878be798fc0bfb9670035874d02a7;hb=2bbacb364aa29041af9cbbbd32cfad2e8e387cb3;hp=8cb99ecbb6f1f259fc047677014db523f240ecb5;hpb=ef9512388b15e1e5e2b3592299ffe489ac43abb4;p=lilypond.git diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc index 8cb99ecbb6..6dd2930013 100644 --- a/lily/paper-column-engraver.cc +++ b/lily/paper-column-engraver.cc @@ -34,7 +34,8 @@ #include "translator.icc" -Paper_column_engraver::Paper_column_engraver () +Paper_column_engraver::Paper_column_engraver (Context *c) + : Engraver (c) { last_moment_.main_part_ = Rational (-1, 1); command_column_ = 0; @@ -229,6 +230,18 @@ Paper_column_engraver::stop_translation_timestep () command_column_->set_property ("when", m); musical_column_->set_property ("when", m); + SCM mpos = get_property ("measurePosition"); + SCM barnum = get_property ("internalBarNumber"); + if (unsmob (mpos) + && scm_is_integer (barnum)) + { + SCM where = scm_cons (barnum, + mpos); + + command_column_->set_property ("rhythmic-location", where); + musical_column_->set_property ("rhythmic-location", where); + } + for (vsize i = 0; i < items_.size (); i++) { Item *elem = items_[i]; @@ -274,18 +287,6 @@ Paper_column_engraver::stop_translation_timestep () first_ = false; label_events_.clear (); - - SCM mpos = get_property ("measurePosition"); - SCM barnum = get_property ("internalBarNumber"); - if (unsmob (mpos) - && scm_is_integer (barnum)) - { - SCM where = scm_cons (barnum, - mpos); - - command_column_->set_property ("rhythmic-location", where); - musical_column_->set_property ("rhythmic-location", where); - } } void