X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=04387ef9f702f89d4dee623f6d19d69452bc2a9b;hb=027f1aab2ec8fbbc8a20cf421510f8b9a259d6d2;hp=eb6d16f6fdb3c4e691cbcc2d91f42e6bf638dc03;hpb=6ce61146edb1c36647b514778c29cdc9beedab6a;p=lilypond.git diff --git a/lily/spanner.cc b/lily/spanner.cc index eb6d16f6fd..04387ef9f7 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -3,132 +3,288 @@ source file of the GNU LilyPond music typesetter - (c) 1996,1997 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys */ +#include +#include + #include "debug.hh" #include "spanner.hh" -#include "p-col.hh" -#include "p-score.hh" +#include "paper-column.hh" +#include "paper-score.hh" +#include "molecule.hh" +#include "paper-outputter.hh" +#include "paper-column.hh" +#include "line-of-score.hh" +#include "break-align-item.hh" -IMPLEMENT_STATIC_NAME(Spanner); -IMPLEMENT_IS_TYPE_B1(Spanner,Score_elem); void -Spanner::do_print()const +Spanner::do_break_processing () { -#ifndef NPRINT - mtor << "Between col "; -// huh? this does not work -// mtor << ( left_col_l_ ? left_col_l_->rank_i() : "nop" ); - if ( left_col_l_ ) - mtor << left_col_l_->rank_i(); - else - mtor << "nop"; - mtor << ", "; -// mtor << ( right_col_l_ ? right_col_l_->rank_i() : "nop" ); - if ( right_col_l_ ) - mtor << right_col_l_->rank_i(); - else - mtor << "nop"; - if (broken_into_l_arr_.size()) - mtor << "with broken pieces\n"; -#endif + //break_into_pieces + Item * left = spanned_drul_[LEFT]; + Item * right = spanned_drul_[RIGHT]; + + if (!left || !right) + return; + + /* + Check if our parent in X-direction spans equally wide + or wider than we do. + */ + for (int a = X_AXIS; a < NO_AXES; a ++) + { + if (Spanner* parent = dynamic_cast (parent_l ((Axis)a))) + { + if (!parent->spanned_rank_iv ().contains_b (this->spanned_rank_iv ())) + { + programming_error (to_str ("Spanner `%s' is not fully contained in parent spanner `%s'.", + classname (this), + classname (parent))); + } + } + } + + if (line_l () || broken_b ()) + return; + + if (left == right) + { + /* + If we have a spanner spanning one column, we must break it + anyway because it might provide a parent for another item. */ + Direction d = LEFT; + do + { + Item* bound = left->find_prebroken_piece (d); + if (!bound) + programming_error ("no broken bound"); + else if (bound->line_l ()) + { + Spanner * span_p = dynamic_cast( clone ()); + span_p->set_bound (LEFT, bound); + span_p->set_bound (RIGHT, bound); + + assert (span_p->line_l ()); + span_p->line_l ()->typeset_element (span_p); + broken_into_l_arr_.push (span_p); + } + } + while ((flip(&d))!= LEFT); + } + else + { + Link_array break_points = pscore_l_->line_l_->broken_col_range (left,right); + + break_points.insert (left,0); + break_points.push (right); + + for (int i=1; i < break_points.size(); i++) + { + Drul_array bounds; + bounds[LEFT] = break_points[i-1]; + bounds[RIGHT] = break_points[i]; + Direction d = LEFT; + do + { + if (!bounds[d]->line_l()) + bounds[d] = bounds[d]->find_prebroken_piece(- d); + } + while ((flip(&d))!= LEFT); + + if (!bounds[LEFT] || ! bounds[RIGHT]) + { + programming_error ("bounds of this piece aren't breakable. "); + continue; + } + + Spanner *span_p = dynamic_cast(clone ()); + span_p->set_bound(LEFT,bounds[LEFT]); + span_p->set_bound(RIGHT,bounds[RIGHT]); + + + assert (bounds[LEFT]->line_l () == + bounds[RIGHT]->line_l ()); + + bounds[LEFT]->line_l ()->typeset_element (span_p); + broken_into_l_arr_.push (span_p); + } + } + broken_into_l_arr_.sort (Spanner::compare); } void -Spanner::break_into_pieces() +Spanner::set_my_columns() { - PCol * left = left_col_l_; - PCol * right = right_col_l_; - if(left->daddy_l_) left = left->daddy_l_; - if(right->daddy_l_) right = right->daddy_l_; - - - Link_array break_cols = pscore_l_->broken_col_range(left,right); - Link_array broken_into_l_arr; - - break_cols.insert(left,0); - break_cols.push(right); - - for (int i=1; i < break_cols.size(); i++) { - Spanner* span_p = clone()->spanner(); - left = break_cols[i-1]; - right = break_cols[i]; - if (!right->line_l_) - right = right->prebreak_p_; - if (!left->line_l_) - left = left->postbreak_p_; - - assert(left&&right && left->line_l_ == right->line_l_); - - span_p->left_col_l_ = left; - span_p->right_col_l_ = right; - - pscore_l_->typeset_broken_spanner(span_p); - broken_into_l_arr.push( span_p ); + Direction i = (Direction) LEFT; + do + { + if (!spanned_drul_[i]->line_l()) + set_bound(i,spanned_drul_[i]->find_prebroken_piece((Direction) -i)); + } + while (flip(&i) != LEFT); +} + +Interval_t +Spanner::spanned_rank_iv () +{ + Interval_t iv (0, 0); + + if (spanned_drul_[LEFT]) + { + iv[LEFT] = Paper_column::rank_i (spanned_drul_[LEFT]->column_l ()); } - - broken_into_l_arr_ = broken_into_l_arr; + if (spanned_drul_[RIGHT]) + { + iv[RIGHT] = Paper_column::rank_i (spanned_drul_[RIGHT]->column_l ()); + } + return iv; +} + +Item* +Spanner::get_bound (Direction d) const +{ + return spanned_drul_ [d]; } void -Spanner::do_break_processing() +Spanner::set_bound(Direction d, Score_element*s) { - if (!left_col_l_->line_l_) - left_col_l_ = left_col_l_->postbreak_p_; - if (!right_col_l_->line_l_) - right_col_l_ = right_col_l_->prebreak_p_; - - - if (!line_l()) { - break_into_pieces(); - for (int i=0; i < broken_into_l_arr_.size(); i++) - broken_into_l_arr_[i]->handle_broken_dependencies(); - } else { - handle_broken_dependencies(); + Item * i = dynamic_cast (s); + if (!i) + { + programming_error ("Must have Item for spanner bound."); + return; + } + + spanned_drul_[d] =i; + + /** + We check for Line_of_score to prevent the column -> line_of_score + -> column -> line_of_score -> etc situation */ + if (d== LEFT && !dynamic_cast (this)) + { + set_parent (i, X_AXIS); } } -Spanner::Spanner() +Spanner::Spanner (SCM s) + : Score_element (s) { - left_col_l_ = right_col_l_ = 0; + spanned_drul_[LEFT]=0; + spanned_drul_[RIGHT]=0; } - -Interval -Spanner::do_width()const +Spanner::Spanner (Spanner const &s) + : Score_element (s) { - Real r = right_col_l_->hpos_f_; - Real l = left_col_l_->hpos_f_; - assert(*left_col_l_ < *right_col_l_); - assert(r>=l); - - return Interval(0, r-l); + spanned_drul_[LEFT] = spanned_drul_[RIGHT] =0; +} + + +Real +Spanner::spanner_length() const +{ + Real l = spanned_drul_[LEFT]->relative_coordinate (0, X_AXIS); + Real r = spanned_drul_[RIGHT]->relative_coordinate (0, X_AXIS); + + if (r< l) + programming_error ("spanner with negative length"); + + return r-l; } Line_of_score * -Spanner::line_l()const +Spanner::line_l() const +{ + if (!spanned_drul_[LEFT] || !spanned_drul_[RIGHT]) + return 0; + if (spanned_drul_[LEFT]->line_l () != spanned_drul_[RIGHT]->line_l ()) + return 0; + return spanned_drul_[LEFT]->line_l(); +} + + +Score_element* +Spanner::find_broken_piece (Line_of_score*l) const { - if ( left_col_l_->line_l_ != right_col_l_->line_l_) - return 0; - return left_col_l_->line_l_; + int idx = binsearch_link_array (broken_into_l_arr_, (Spanner*)l, Spanner::compare); + + if (idx < 0) + return 0; + else + return broken_into_l_arr_ [idx]; } -Spanner* -Spanner::find_broken_piece(Line_of_score*l)const +int +Spanner::compare (Spanner * const &p1, Spanner * const &p2) { - for (int i=0; i < broken_into_l_arr_.size(); i++) - if(broken_into_l_arr_[i]->line_l() == l) - return broken_into_l_arr_[i]; - return 0; - + return p1->line_l ()->rank_i_ - p2->line_l ()->rank_i_; } bool -Spanner::broken_b()const +Spanner::broken_b() const +{ + return broken_into_l_arr_.size(); +} + + +/* + If this is a broken spanner, return the amount the left end is to be + shifted horizontally so that the spanner starts after the initial + clef and key on the staves. This is necessary for ties, slurs, + crescendo and decrescendo signs, for example. +*/ +Real +Spanner::get_broken_left_end_align () const +{ + Paper_column *sc = dynamic_cast (spanned_drul_[LEFT]->column_l()); + + // Relevant only if left span point is first column in line + if(sc != NULL && + sc->break_status_dir () == RIGHT) + { + /* + + We used to do a full search for the Break_align_item. + But that doesn't make a difference, since the Paper_column + is likely to contain only a Break_align_item. + */ + return sc->extent (X_AXIS)[RIGHT]; + } + + return 0.0; +} + +SCM +Spanner::do_derived_mark () +{ + /* + We'd be fucked if this is called before spanned_drul_[] is inited. */ + if (status_i_ == ORPHAN) + return SCM_EOL; + + Direction d = LEFT; + do + if (spanned_drul_[d]) + scm_gc_mark (spanned_drul_[d]->self_scm ()); + while (flip (&d) != LEFT); + + for (int i= broken_into_l_arr_.size () ; i--;) + scm_gc_mark (broken_into_l_arr_[i]->self_scm ()); + + return SCM_EOL; +} + +void +add_bound_item (Spanner* sp, Item*it) { - return broken_into_l_arr_.size(); + if (!sp->get_bound (LEFT)) + sp->set_bound (LEFT, it); + else + sp->set_bound (RIGHT, it); }