X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=d8c0e49935c5a676f1fcdbf43b9765c00a170ad2;hb=d9b43b93f2c885409bafdb157138158f65cc49aa;hp=f9cb12f4c1ae7dbaddf0329cfa4c1fb777aafa0a;hpb=3c2f386f1385a10dafbb811be245f5a75d6b132c;p=lilypond.git diff --git a/lily/spanner.cc b/lily/spanner.cc index f9cb12f4c1..d8c0e49935 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ #include #include @@ -18,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 () @@ -36,13 +36,13 @@ Spanner::do_break_processing () */ for (int a = X_AXIS; a < NO_AXES; a ++) { - if (Spanner* parent = dynamic_cast (parent_l ((Axis)a))) + 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'.", - classname (this), - classname (parent))); + name ().ch_C (), + parent->name ().ch_C ())); } } } @@ -50,7 +50,7 @@ Spanner::do_break_processing () if (line_l () || broken_b ()) return; - if (left == right) + if (left == right) { /* If we have a spanner spanning one column, we must break it @@ -63,16 +63,16 @@ Spanner::do_break_processing () programming_error ("no broken bound"); else if (bound->line_l ()) { - Spanner * span_p = dynamic_cast( clone ()); + 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); + span_p->line_l ()->typeset_grob (span_p); broken_into_l_arr_.push (span_p); } } - while ((flip(&d))!= LEFT); + while ((flip (&d))!= LEFT); } else { @@ -81,7 +81,7 @@ Spanner::do_break_processing () break_points.insert (left,0); break_points.push (right); - for (int i=1; i < break_points.size(); i++) + for (int i=1; i < break_points.size (); i++) { Drul_array bounds; bounds[LEFT] = break_points[i-1]; @@ -89,10 +89,10 @@ Spanner::do_break_processing () Direction d = LEFT; do { - if (!bounds[d]->line_l()) - bounds[d] = bounds[d]->find_prebroken_piece(- d); + if (!bounds[d]->line_l ()) + bounds[d] = bounds[d]->find_prebroken_piece (- d); } - while ((flip(&d))!= LEFT); + while ((flip (&d))!= LEFT); if (!bounds[LEFT] || ! bounds[RIGHT]) { @@ -100,31 +100,38 @@ Spanner::do_break_processing () continue; } - Spanner *span_p = dynamic_cast(clone ()); - span_p->set_bound(LEFT,bounds[LEFT]); - span_p->set_bound(RIGHT,bounds[RIGHT]); - + 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); + 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_bound(i,spanned_drul_[i]->find_prebroken_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 @@ -149,8 +156,12 @@ 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, Score_element*s) +Spanner::set_bound (Direction d, Grob*s) { Item * i = dynamic_cast (s); if (!i) @@ -168,25 +179,36 @@ Spanner::set_bound(Direction d, Score_element*s) { set_parent (i, X_AXIS); } -} + /* + Signal that this column needs to be kept alive. They need to be + kept alive to have meaningful position and linebreaking. + + [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_grob (i, ly_symbol2scm ("bounded-by-me"), this); + } +} Spanner::Spanner (SCM s) - : Score_element (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); @@ -198,20 +220,20 @@ Spanner::spanner_length() const } 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 { - 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; @@ -227,9 +249,9 @@ Spanner::compare (Spanner * const &p1, Spanner * const &p2) } bool -Spanner::broken_b() const +Spanner::broken_b () const { - return broken_into_l_arr_.size(); + return broken_into_l_arr_.size (); } @@ -242,10 +264,10 @@ Spanner::broken_b() const Real Spanner::get_broken_left_end_align () const { - Paper_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) { /* @@ -254,23 +276,30 @@ 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; } -void +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_); + 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_); + scm_gc_mark (broken_into_l_arr_[i]->self_scm ()); + + return SCM_EOL; } void @@ -281,3 +310,99 @@ add_bound_item (Spanner* sp, Item*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))) + { + 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 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; +} + + +Spanner* +unsmob_spanner (SCM s ) +{ + return dynamic_cast (unsmob_grob (s)); +}