X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=01ae90892ce657273cf1a7b27f4932a6ec114c78;hb=76f13ab50fc726c89fa7c96f3deed519d2d773dc;hp=ca2f5d5618124553beb744034d9f0cb8e68ada26;hpb=e4a2733b4c0ab484305dc19fc598d70a9631539b;p=lilypond.git diff --git a/lily/spanner.cc b/lily/spanner.cc index ca2f5d5618..01ae90892c 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -3,8 +3,10 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--1999 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys */ +#include + #include "dimension-cache.hh" #include "debug.hh" #include "spanner.hh" @@ -12,115 +14,169 @@ #include "paper-score.hh" #include "molecule.hh" #include "paper-outputter.hh" -#include "score-column.hh" +#include "paper-column.hh" #include "line-of-score.hh" +#include "break-align-item.hh" -void -Spanner::do_print() const -{ -#ifndef NPRINT - DOUT << "Between " << classname (spanned_drul_[LEFT]) - << " and " << classname (spanned_drul_[RIGHT]) << '\n'; - - if (broken_b ()) - DOUT << "Broken in " << to_str (broken_into_l_arr_.size ()) << " pieces"; -#endif -} void -Spanner::break_into_pieces () +Spanner::do_break_processing () { - if (broken_b ()) - return; - + //break_into_pieces Item * left = spanned_drul_[LEFT]; Item * right = spanned_drul_[RIGHT]; + if (!left || !right) + return; + if (left == right) { - warning (_ ("left spanpoint is right spanpoint\n")); - return; + warning (_f ("Spanner `%s' has equal left and right spanpoints", + classname (this))); } - - Link_array break_points = pscore_l_->broken_col_range (left,right); - break_points.insert (left,0); - break_points.push (right); + /* + 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; - for (int i=1; i < break_points.size(); i++) + if (left == right) { - Breaking_information info; - info.bounds_[LEFT] = break_points[i-1]; - info.bounds_[RIGHT] = break_points[i]; + /* + FIXME: this is broken. + */ + /* + 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 *&pc_l = info.bounds_[d] ; - if (!pc_l->line_l()) - pc_l = pc_l->find_prebroken_piece(- d); - - assert (pc_l); - if (!info.line_l_) - info.line_l_ = pc_l-> line_l (); - else - assert( info.line_l_ = pc_l->line_l ()); - + Item* bound = left->find_prebroken_piece (d); + 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); - Spanner *span_p = dynamic_cast(clone ()); - span_p->set_bounds(LEFT,info.bounds_[LEFT]); - span_p->set_bounds(RIGHT,info.bounds_[RIGHT]); - pscore_l_->typeset_element (span_p); + if (!bounds[LEFT] || ! bounds[RIGHT]) + { + programming_error ("bounds of this piece aren't breakable. "); + continue; + } - info.broken_spanner_l_ = span_p; - span_p->handle_broken_dependencies(); + Spanner *span_p = dynamic_cast(clone ()); + span_p->set_bound(LEFT,bounds[LEFT]); + span_p->set_bound(RIGHT,bounds[RIGHT]); - broken_into_l_arr_.push (span_p); + + 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::set_my_columns() { - Direction i = (Direction)1; + Direction i = (Direction) LEFT; do { if (!spanned_drul_[i]->line_l()) - set_bounds(i,spanned_drul_[i]->find_prebroken_piece((Direction)-i)); + set_bound(i,spanned_drul_[i]->find_prebroken_piece((Direction) -i)); } - while (flip(&i) != 1); + while (flip(&i) != LEFT); } -void -Spanner::set_bounds(Direction d, Item*i) +Interval_t +Spanner::spanned_rank_iv () { - spanned_drul_[d] =i; - if (i) + Interval_t iv (0, 0); + + if (spanned_drul_[LEFT]) { - i->used_b_ = true; + iv[LEFT] = spanned_drul_[LEFT]->column_l ()->rank_i (); } - - if (d== LEFT) + if ( spanned_drul_[RIGHT]) { - set_parent ( i, X_AXIS); + iv[RIGHT] = spanned_drul_[RIGHT]->column_l ()->rank_i (); } - - if (spanned_drul_[Direction(-d)] == spanned_drul_[d] - && i) - warning (_f ("Spanner `%s\' with equal left and right spanpoints", classname (this))); + return iv; +} + +Item* +Spanner::get_bound (Direction d) const +{ + return spanned_drul_ [d]; } void -Spanner::do_break_processing() +Spanner::set_bound(Direction d, Item*i) { - if (!line_l()) - break_into_pieces (); - else - handle_broken_dependencies(); + 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); + } + + if (spanned_drul_[Direction(-d)] == spanned_drul_[d] + && i) + warning (_f ("Spanner `%s' has equal left and right spanpoints", + classname (this))); } -Spanner::Spanner () + +Spanner::Spanner (SCM s) + : Score_element (s) { spanned_drul_[LEFT]=0; spanned_drul_[RIGHT]=0; @@ -133,16 +189,16 @@ Spanner::Spanner (Spanner const &s) } -Interval -Spanner::do_width() const +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) - warning ("Spanner with negative length"); - - return Interval (0, r-l); + programming_error ("spanner with negative length"); + + return r-l; } Line_of_score * @@ -150,22 +206,28 @@ Spanner::line_l() const { if (!spanned_drul_[LEFT] || !spanned_drul_[RIGHT]) return 0; - if (spanned_drul_[LEFT]->line_l() != spanned_drul_[RIGHT]->line_l()) + if (spanned_drul_[LEFT]->line_l () != spanned_drul_[RIGHT]->line_l ()) return 0; return spanned_drul_[LEFT]->line_l(); } -Spanner* +Score_element* Spanner::find_broken_piece (Line_of_score*l) const { - 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]; - } + 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]; +} - return 0; + +int +Spanner::compare (Spanner * const &p1, Spanner * const &p2) +{ + return p1->line_l ()->rank_i_ - p2->line_l ()->rank_i_; } bool @@ -200,55 +262,35 @@ Spanner::do_space_processing () Array ss (get_springs ()); for (int i=0; i < ss.size (); i++) { - ss[i].add_to_cols (); - } -} - -/* - UGH. - */ -void -Spanner::handle_broken_dependents () -{ - Spanner *unbrok = dynamic_cast (original_l_); - if (!unbrok || parent_l(Y_AXIS)) - return; - - Spanner *refpoint = dynamic_cast (unbrok->parent_l (Y_AXIS)); - - if (refpoint) - { - Spanner * broken_refpoint = refpoint->find_broken_piece (line_l ()); - if (broken_refpoint) - set_parent ( broken_refpoint,Y_AXIS); + if (isinf (ss[i].distance_f_)) + programming_error ("weird spring"); else - programming_error ("Spanner y -refpoint lost."); + ss[i].add_to_cols (); } } -// 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. +/* + 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 { - int i; - Line_of_score *l; - Score_column *sc = dynamic_cast (spanned_drul_[LEFT]->column_l()); + 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->line_l ()->cols_.find_i (sc) == 0) + if(sc != NULL && + sc->break_status_dir () == RIGHT) { - // We could possibly return the right edge of the whole Score_column here, - // but we do a full search for the Break_align_item. - for(i = 0; i < sc->elem_l_arr_.size (); i++) - { - if(0 == strcmp (classname (sc->elem_l_arr_[i]), "Break_align_item")) - { - return sc->elem_l_arr_[i]->extent (X_AXIS) [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;