From: fred Date: Sun, 24 Mar 2002 19:39:29 +0000 (+0000) Subject: lilypond-0.0.52 X-Git-Tag: release/1.5.59~4947 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3e43c6b7ef694206eb6dde55065232996ec0e32b;p=lilypond.git lilypond-0.0.52 --- diff --git a/lily/note-column.cc b/lily/note-column.cc index 4bb2f1d5e6..dbeeba4a91 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -26,6 +26,11 @@ Note_column::add(Stem*stem_l) void Note_column::add(Notehead* n_l) { + if (head_l_arr_.size()) + assert(n_l->rest_b_ == rest_b_); + else + rest_b_ = n_l->rest_b_; + head_l_arr_.push(n_l); add_dependency(n_l); } @@ -81,6 +86,9 @@ Note_column::do_width()const return r; void Note_column::do_pre_processing() { + if (stem_l_ && !dir_i_) + dir_i_ = stem_l_->dir_i_; + if (!script_l_arr_.size()) return; @@ -128,8 +136,25 @@ Note_column::do_pre_processing() } } } + Note_column::Note_column() { + h_shift_b_ =false; stem_l_ =0; + rest_b_ = false; + dir_i_ =0; +} +void +Note_column::sort() +{ + head_l_arr_.sort( Notehead::compare); } +Interval_t +Note_column::head_positions_interval()const +{ + ( (Note_column*)this)->sort(); + return Interval_t ( head_l_arr_[0]->position, + head_l_arr_.top()->position); + +}