X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=3579abefca1efc1d1036d41a9f5141cfc3fe2354;hb=b2d2fdedaee06d957f69bafc0d9fba706b415a8c;hp=dd3d24ead3276ff9e2dbcc58755cf8042fdf02b0;hpb=01d84d552854fb399bd0e819502c6c2db2a1b214;p=lilypond.git diff --git a/lily/spanner.cc b/lily/spanner.cc index dd3d24ead3..3579abefca 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -3,155 +3,237 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--1999 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ +#include +#include + -#include "dimension-cache.hh" #include "debug.hh" #include "spanner.hh" #include "paper-column.hh" #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" +#include "group-interface.hh" void -Spanner::break_into_pieces () +Spanner::do_break_processing () { - if (line_l () || broken_b ()) - return; - + //break_into_pieces Item * left = spanned_drul_[LEFT]; Item * right = spanned_drul_[RIGHT]; - if (left == 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 ++) { - warning (_ ("Left spanpoint is right spanpoint")); - return; + if (Spanner* parent = dynamic_cast (get_parent ((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'.", + name ().ch_C (), + parent->name ().ch_C ())); + } + } } - Link_array break_points = pscore_l_->broken_col_range (left,right); - - break_points.insert (left,0); - break_points.push (right); + if (line_l () || broken_b ()) + return; - for (int i=1; i < break_points.size(); i++) + if (left == right) { - Drul_array bounds; - bounds[LEFT] = break_points[i-1]; - bounds[RIGHT] = break_points[i]; + /* + 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 = bounds[d] ; - if (!pc_l->line_l()) - pc_l = pc_l->find_broken_piece(- d); - - assert (pc_l); + 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_grob (span_p); + broken_into_l_arr_.push (span_p); + } } - while ((flip(&d))!= LEFT); + while ((flip (&d))!= LEFT); + } + else + { + Link_array break_points = pscore_l_->line_l_->broken_col_range (left,right); - Spanner *span_p = dynamic_cast(clone ()); - span_p->set_bounds(LEFT,bounds[LEFT]); - span_p->set_bounds(RIGHT,bounds[RIGHT]); - - pscore_l_->typeset_element (span_p); - span_p->handle_broken_dependencies(); + break_points.insert (left,0); + break_points.push (right); - broken_into_l_arr_.push (span_p); - } + 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]); + + if (!bounds[LEFT]->line_l () + + || !bounds[RIGHT]->line_l () + || bounds[LEFT]->line_l () != bounds[RIGHT]->line_l ()) + { + programming_error ("bounds of spanner are invalid"); + span_p->suicide (); + } + else + { + bounds[LEFT]->line_l ()->typeset_grob (span_p); + broken_into_l_arr_.push (span_p); + } + } + } broken_into_l_arr_.sort (Spanner::compare); } void -Spanner::set_my_columns() +Spanner::set_my_columns () { Direction i = (Direction) LEFT; do { - if (!spanned_drul_[i]->line_l()) - set_bounds(i,spanned_drul_[i]->find_broken_piece((Direction) -i)); + if (!spanned_drul_[i]->line_l ()) + set_bound (i,spanned_drul_[i]->find_prebroken_piece ((Direction) -i)); } - while (flip(&i) != LEFT); + 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 ()); + } + 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]; +} + +/* + Set the items that this spanner spans. If D == LEFT, we also set the + X-axis parent of THIS to S. +*/ void -Spanner::set_bounds(Direction d, Item*i) +Spanner::set_bound (Direction d, Grob*s) { - spanned_drul_[d] =i; - if (i) + Item * i = dynamic_cast (s); + if (!i) { - i->used_b_ = true; + programming_error ("Must have Item for spanner bound."); + return; } + + spanned_drul_[d] =i; /** - Prevent the column -> line_of_score -> column -> line_of_score -> etc situation - */ + 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))); -} - + /* + Signal that this column needs to be kept alive. They need to be + kept alive to have meaningful position and linebreaking. -void -Spanner::do_break_processing() -{ - break_into_pieces (); - handle_broken_dependencies(); + [maybe we should try keeping all columns alive?, and perhaps + inherit position from their (non-)musical brother] + + */ + if (dynamic_cast (i)) + { + Pointer_group_interface::add_element (i, ly_symbol2scm ("bounded-by-me"), this); + } } -Spanner::Spanner () +Spanner::Spanner (SCM s) + : Grob (s) { spanned_drul_[LEFT]=0; spanned_drul_[RIGHT]=0; } Spanner::Spanner (Spanner const &s) - : Score_element (s) + : Grob (s) { spanned_drul_[LEFT] = spanned_drul_[RIGHT] =0; } - Real -Spanner::spanner_length() const +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")); - + 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(); + return spanned_drul_[LEFT]->line_l (); } -Score_element* +Grob* Spanner::find_broken_piece (Line_of_score*l) const { - Spanner* me = (Spanner*) this; - break_into_pieces (); - - int idx = binsearch_link_array (broken_into_l_arr_, (Spanner*)l, Spanner::compare); + int idx = binsearch_link_array (broken_into_l_arr_, (Spanner*)l, Spanner::compare); if (idx < 0) return 0; @@ -163,44 +245,15 @@ Spanner::find_broken_piece (Line_of_score*l) const int Spanner::compare (Spanner * const &p1, Spanner * const &p2) { - return p1->line_l ()->rank_i_ - p2->line_l ()->rank_i_; + return p1->line_l ()->rank_i_ - p2->line_l ()->rank_i_; } bool -Spanner::broken_b() const -{ - return broken_into_l_arr_.size(); -} - -Array -Spanner::get_rods () const +Spanner::broken_b () const { - Array r; - return r; + return broken_into_l_arr_.size (); } -Array -Spanner::get_springs () const -{ - Array s; - return s; -} - -void -Spanner::do_space_processing () -{ - Array rs (get_rods ()); - for (int i=0; i < rs.size (); i++) - { - rs[i].add_to_cols (); - } - - Array ss (get_springs ()); - for (int i=0; i < ss.size (); i++) - { - ss[i].add_to_cols (); - } -} /* If this is a broken spanner, return the amount the left end is to be @@ -211,32 +264,138 @@ Spanner::do_space_processing () Real Spanner::get_broken_left_end_align () const { - 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 && + 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. - /* - In fact that doesn't make a difference, since the Score_column + + 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. */ -#if 0 - for(SCM s = sc->get_elt_property ("elements"); gh_pair_p (s); - s = gh_cdr (s)) + return sc->extent (sc, 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_c_ == 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) +{ + if (!sp->get_bound (LEFT)) + sp->set_bound (LEFT, it); + else + sp->set_bound (RIGHT, it); +} + +/* + Extends EXTREMAL_PAIR to include IT + */ +static void +extend_spanner_over_item (Item *it, SCM extremal_pair) +{ + if (!it) + return; + Item * col = it->column_l (); + Item * i1 = dynamic_cast (unsmob_grob (ly_car (extremal_pair))); + Item * i2 = dynamic_cast (unsmob_grob (ly_cdr (extremal_pair))); + int r = Paper_column::rank_i (col); + if (!i1 || r < Paper_column::rank_i (i1->column_l ())) + { + gh_set_car_x (extremal_pair, it->self_scm ()); + } + if (!i2 || r > Paper_column::rank_i (i2->column_l ())) + { + gh_set_cdr_x (extremal_pair, it->self_scm ()); + } +} + +/* + Extends EXTREMAL_PAIR to include every grob in VALUE + */ +static void +extend_spanner_over_elements (SCM value, SCM extremal_pair) +{ + if (gh_pair_p (value)) + { + extend_spanner_over_elements (ly_car (value), extremal_pair); + extend_spanner_over_elements (ly_cdr (value), extremal_pair); + } + else if (unsmob_grob (value)) + { + if (Spanner * sp = dynamic_cast (unsmob_grob (value))) { - Score_element *e = SMOB_TO_TYPE (Score_element, gh_car (s)); - if(dynamic_cast (e)) - { - return e->extent (X_AXIS) [RIGHT]; - } + extend_spanner_over_item (sp->get_bound (LEFT), extremal_pair); + extend_spanner_over_item (sp->get_bound (RIGHT), extremal_pair); } -#endif - return sc->extent (X_AXIS)[RIGHT]; + else if (Item * it= dynamic_cast (unsmob_grob (value))) + extend_spanner_over_item (it, extremal_pair); } +} - return 0.0; + +/* + Make sure that the left and right bounds encompasses all objects it + points to. + + TODO: maybe be more specific. Most probably fucks up if someone sets + a pointer to the staff symbol in S +*/ +void +extend_spanner_over_elements (Grob*s) +{ + Spanner*sp = dynamic_cast (s); + + SCM s1 = sp->get_bound (LEFT) ? sp->get_bound (LEFT)->self_scm () : SCM_EOL; + SCM s2 = sp->get_bound (RIGHT) ? sp->get_bound (RIGHT)->self_scm () : SCM_EOL; + + SCM pair = gh_cons (s1,s2); + extend_spanner_over_elements (sp->mutable_property_alist_, pair); + + Grob *p1 = unsmob_grob (ly_car (pair)); + Grob* p2 = unsmob_grob (ly_cdr (pair)); + sp->set_bound (LEFT,p1); + sp->set_bound (RIGHT, p2); +} + + +MAKE_SCHEME_CALLBACK (Spanner,set_spacing_rods,1); +SCM +Spanner::set_spacing_rods (SCM smob) +{ + Grob*me = unsmob_grob (smob); + + Rod r; + Spanner*sp = dynamic_cast (me); + r.item_l_drul_[LEFT] = sp->get_bound (LEFT); + r.item_l_drul_[RIGHT] = sp->get_bound (RIGHT); + r.distance_f_ = + gh_scm2double (me->get_grob_property ("minimum-length")) + * 1.0; + + r.add_to_cols (); + return SCM_UNSPECIFIED; }