X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=d6a356572903dde62a2c892b555712b188fff30c;hb=6f96331d77b66f223cd9f4f68b857b53a2dd6c03;hp=6e32dccc66bc786376b428e92645bdf485ab6566;hpb=1a72867b0c5db394ec87a1901910792cf850bc57;p=lilypond.git diff --git a/lily/spanner.cc b/lily/spanner.cc index 6e32dccc66..d6a3565729 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -6,8 +6,9 @@ (c) 1996--2000 Han-Wen Nienhuys */ #include +#include + -#include "dimension-cache.hh" #include "debug.hh" #include "spanner.hh" #include "paper-column.hh" @@ -17,7 +18,7 @@ #include "paper-column.hh" #include "line-of-score.hh" #include "break-align-item.hh" - +#include "group-interface.hh" void Spanner::do_break_processing () @@ -25,13 +26,10 @@ Spanner::do_break_processing () //break_into_pieces Item * left = spanned_drul_[LEFT]; Item * right = spanned_drul_[RIGHT]; - - if (left == right) - { - warning (_f ("Spanner `%s' has equal left and right spanpoints", - classname (this))); - } + if (!left || !right) + return; + /* Check if our parent in X-direction spans equally wide or wider than we do. @@ -40,33 +38,12 @@ Spanner::do_break_processing () { if (Spanner* parent = dynamic_cast (parent_l ((Axis)a))) { -#if 1 - /* - Urg, should use instantiate-compare, or maybe mysterious - column_width/contains functions? - */ - if (spanned_drul_[LEFT] && spanned_drul_[RIGHT] - && parent->spanned_drul_[LEFT] && parent->spanned_drul_[RIGHT]) - { - if (parent->spanned_drul_[LEFT]->column_l ()->rank_i () - > spanned_drul_[LEFT]->column_l ()->rank_i () > 0 - || parent->spanned_drul_[RIGHT]->column_l ()->rank_i () - < spanned_drul_[RIGHT]->column_l ()->rank_i ()) - { - warning (_f ("Spanner `%s' is not fully contained in parent spanner `%s'.", - classname (this), classname (parent))); - } - } -#else - /* - column_width (), contains ()? - */ - if (!parent->column_width ().contains (this->column_width ())) + if (!parent->spanned_rank_iv ().contains_b (this->spanned_rank_iv ())) { - warning (_f ("Spanner `%s' is not fully contained in parent spanner `%s'.", - classname (this), classname (parent))); + programming_error (to_str ("Spanner `%s' is not fully contained in parent spanner `%s'.", + name().ch_C(), + parent->name ().ch_C ())); } -#endif } } @@ -75,29 +52,31 @@ Spanner::do_break_processing () if (left == right) { - /* - 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* bound = left->find_broken_piece (d); - Spanner * span_p = dynamic_cast( clone ()); - span_p->set_bound (LEFT, bound); - span_p->set_bound (RIGHT, bound); - - assert (span_p->line_l ()); - pscore_l_->typeset_element (span_p); - broken_into_l_arr_.push (span_p); + 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); } else { - Link_array break_points = pscore_l_->broken_col_range (left,right); + Link_array break_points = pscore_l_->line_l_->broken_col_range (left,right); break_points.insert (left,0); break_points.push (right); @@ -110,20 +89,34 @@ Spanner::do_break_processing () 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); + 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]); - - pscore_l_->typeset_element (span_p); - broken_into_l_arr_.push (span_p); + + 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); @@ -136,11 +129,26 @@ Spanner::set_my_columns() do { if (!spanned_drul_[i]->line_l()) - set_bound(i,spanned_drul_[i]->find_broken_piece((Direction) -i)); + 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 ()); + } + if (spanned_drul_[RIGHT]) + { + iv[RIGHT] = Paper_column::rank_i (spanned_drul_[RIGHT]->column_l ()); + } + return iv; +} Item* Spanner::get_bound (Direction d) const @@ -148,43 +156,57 @@ 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_bound(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. -Spanner::Spanner () + [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, "bounded-by-me",this); + } +} + +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 { @@ -208,7 +230,7 @@ Spanner::line_l() const } -Score_element* +Grob* Spanner::find_broken_piece (Line_of_score*l) const { int idx = binsearch_link_array (broken_into_l_arr_, (Spanner*)l, Spanner::compare); @@ -223,7 +245,7 @@ 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 @@ -232,38 +254,6 @@ Spanner::broken_b() const return broken_into_l_arr_.size(); } -Array -Spanner::get_rods () const -{ - Array r; - return r; -} - -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++) - { - if (isinf (ss[i].distance_f_)) - programming_error ("weird spring"); - else - ss[i].add_to_cols (); - } -} /* If this is a broken spanner, return the amount the left end is to be @@ -286,8 +276,108 @@ Spanner::get_broken_left_end_align () const 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 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_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) +{ + 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 (gh_car (extremal_pair))); + Item * i2 = dynamic_cast (unsmob_grob (gh_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 (gh_car (value), extremal_pair); + extend_spanner_over_elements (gh_cdr (value), extremal_pair); + } + else if (unsmob_grob (value)) + { + if (Spanner * sp = dynamic_cast (unsmob_grob(value))) + { + extend_spanner_over_item (sp->get_bound (LEFT), extremal_pair); + extend_spanner_over_item (sp->get_bound (RIGHT), extremal_pair); + } + else if (Item * it= dynamic_cast (unsmob_grob(value))) + extend_spanner_over_item (it, extremal_pair); + } +} + + +/* + 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 staffsymbol 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 (gh_car (pair)); + Grob* p2 = unsmob_grob (gh_cdr (pair)); + sp->set_bound (LEFT,p1); + sp->set_bound (RIGHT, p2); +} +