X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=12346042df772cbb88f0b4380470ba0a1fe14391;hb=d8a0cd4ba54a7a1911364919d195b31bebcb3935;hp=7272c2d91e76f3c2ae03250394f9ef6ebcfae55c;hpb=287611887cd612ac84dbf10c5fe4e1a44cc56596;p=lilypond.git diff --git a/lily/spanner.cc b/lily/spanner.cc index 7272c2d91e..12346042df 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -3,54 +3,39 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2009 Han-Wen Nienhuys */ -#include -#include - -#include "debug.hh" -#include "spanner.hh" +#include "libc-extension.hh" +#include "moment.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" -#include "group-interface.hh" +#include "pointer-group-interface.hh" +#include "stencil.hh" +#include "system.hh" +#include "warn.hh" + +Grob * +Spanner::clone () const +{ + return new Spanner (*this); +} void Spanner::do_break_processing () { //break_into_pieces - Item * left = spanned_drul_[LEFT]; - Item * right = spanned_drul_[RIGHT]; + 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'.", - name().ch_C(), - parent->name ().ch_C ())); - } - } - } - - if (line_l () || broken_b ()) + + + if (get_system () || is_broken ()) return; - if (left == right) + if (left == right) { /* If we have a spanner spanning one column, we must break it @@ -58,147 +43,161 @@ Spanner::do_break_processing () Direction d = LEFT; do { - Item* bound = left->find_prebroken_piece (d); + Item *bound = left->find_prebroken_piece (d); if (!bound) programming_error ("no broken bound"); - else if (bound->line_l ()) + else if (bound->get_system ()) { - Spanner * span_p = dynamic_cast( clone ()); - span_p->set_bound (LEFT, bound); - span_p->set_bound (RIGHT, bound); + Spanner *span = dynamic_cast (clone ()); + span->set_bound (LEFT, bound); + span->set_bound (RIGHT, bound); - assert (span_p->line_l ()); - span_p->line_l ()->typeset_element (span_p); - broken_into_l_arr_.push (span_p); + assert (span->get_system ()); + span->get_system ()->typeset_grob (span); + broken_intos_.push_back (span); } } - while ((flip(&d))!= LEFT); + while ((flip (&d)) != LEFT); } else { - Link_array break_points = pscore_l_->line_l_->broken_col_range (left,right); + System *root = get_root_system (this); + vector break_points = root->broken_col_range (left, right); - break_points.insert (left,0); - break_points.push (right); + break_points.insert (break_points.begin () + 0, left); + break_points.push_back (right); - for (int i=1; i < break_points.size(); i++) + Slice parent_rank_slice; + parent_rank_slice.set_full (); + + /* + Check if our parent in X-direction spans equally wide + or wider than we do. + */ + for (int a = X_AXIS; a < NO_AXES; a++) { - Drul_array bounds; - bounds[LEFT] = break_points[i-1]; + if (Spanner *parent = dynamic_cast (get_parent ((Axis)a))) + parent_rank_slice.intersect (parent->spanned_rank_interval ()); + } + + for (vsize 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); + if (!bounds[d]->get_system ()) + bounds[d] = bounds[d]->find_prebroken_piece (- d); } - while ((flip(&d))!= LEFT); + while ((flip (&d)) != LEFT); - if (!bounds[LEFT] || ! bounds[RIGHT]) + if (!bounds[LEFT] || ! bounds[RIGHT]) { programming_error ("bounds of this piece aren't breakable. "); - continue; + 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[LEFT]->line_l () != bounds[RIGHT]->line_l ()) - { - programming_error ("bounds[LEFT]->line_l () != bounds[RIGHT]->line_l ()"); -#if 0 - /* - lily crashes upon displaying this ... - - */ - - gh_display (ly_str02scm ("\nspanner:mutable_property_alist_\n")); - gh_display (mutable_property_alist_); - gh_display (ly_str02scm ("\nspanner:immutable_property_alist_\n")); - gh_display (immutable_property_alist_); - gh_newline (); -#endif - span_p->suicide (); - } - else if (!bounds[LEFT]->line_l ()) + bool ok = parent_rank_slice.contains (bounds[LEFT]->get_column ()->get_rank ()); + ok = ok && parent_rank_slice.contains (bounds[RIGHT]->get_column ()->get_rank ()); + + if (!ok) { - // bounds[LEFT]->line_l ()->typeset_element (span_p); - // broken_into_l_arr_.push (span_p); - programming_error ("bounds[LEFT]->line_l () == 0"); - span_p->suicide (); + programming_error (to_string ("Spanner `%s' is not fully contained in parent spanner. Ignoring orphaned part", + name ().c_str ())); + continue; } - else if (!bounds[RIGHT]->line_l ()) + + + Spanner *span = dynamic_cast (clone ()); + span->set_bound (LEFT, bounds[LEFT]); + span->set_bound (RIGHT, bounds[RIGHT]); + + if (!bounds[LEFT]->get_system () + || !bounds[RIGHT]->get_system () + || bounds[LEFT]->get_system () != bounds[RIGHT]->get_system ()) { - // bounds[RIGHT]->line_l ()->typeset_element (span_p); - // broken_into_l_arr_.push (span_p); - programming_error ("bounds[RIGHT]->line_l () == 0"); - span_p->suicide (); + programming_error ("bounds of spanner are invalid"); + span->suicide (); } else { - bounds[LEFT]->line_l ()->typeset_element (span_p); - broken_into_l_arr_.push (span_p); + bounds[LEFT]->get_system ()->typeset_grob (span); + broken_intos_.push_back (span); } } } - broken_into_l_arr_.sort (Spanner::compare); + vector_sort (broken_intos_, Spanner::less); + for (vsize i = broken_intos_.size (); i--;) + broken_intos_[i]->break_index_ = i; +} + +vsize +Spanner::get_break_index () const +{ + return break_index_; } void -Spanner::set_my_columns() +Spanner::set_my_columns () { Direction i = (Direction) LEFT; - do + do { - if (!spanned_drul_[i]->line_l()) - set_bound(i,spanned_drul_[i]->find_prebroken_piece((Direction) -i)); - } - while (flip(&i) != LEFT); -} + if (!spanned_drul_[i]->get_system ()) + set_bound (i, spanned_drul_[i]->find_prebroken_piece ((Direction) -i)); + } + while (flip (&i) != LEFT); +} Interval_t -Spanner::spanned_rank_iv () +Spanner::spanned_rank_interval () const { 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 ()); - } + if (spanned_drul_[LEFT] && spanned_drul_[LEFT]->get_column ()) + iv[LEFT] = spanned_drul_[LEFT]->get_column ()->get_rank (); + if (spanned_drul_[RIGHT] && spanned_drul_[RIGHT]->get_column ()) + iv[RIGHT] = spanned_drul_[RIGHT]->get_column ()->get_rank (); return iv; } -Item* +Interval_t +Spanner::spanned_time () const +{ + return spanned_time_interval (spanned_drul_[LEFT], + spanned_drul_[RIGHT]); +} + + +Item * Spanner::get_bound (Direction d) const { - return spanned_drul_ [d]; + 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); + Item *i = dynamic_cast (s); if (!i) { - programming_error ("Must have Item for spanner bound."); + programming_error ("must have Item for spanner bound of " + name()); return; } - - spanned_drul_[d] =i; + + spanned_drul_[d] = i; /** - We check for Line_of_score to prevent the column -> line_of_score + We check for System 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 (d == LEFT && !dynamic_cast (this)) + set_parent (i, X_AXIS); /* Signal that this column needs to be kept alive. They need to be @@ -206,76 +205,87 @@ Spanner::set_bound(Direction d, Score_element*s) [maybe we should try keeping all columns alive?, and perhaps inherit position from their (non-)musical brother] - */ - if (dynamic_cast (i)) - { - Pointer_group_interface (i, "bounded-by-me").add_element (this); - } + 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; + break_index_ = 0; + spanned_drul_.set (0, 0); } Spanner::Spanner (Spanner const &s) - : Score_element (s) + : Grob (s) { - spanned_drul_[LEFT] = spanned_drul_[RIGHT] =0; + spanned_drul_.set (0, 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) + if (r < l) programming_error ("spanner with negative length"); - return r-l; + return r - l; } -Line_of_score * -Spanner::line_l() const +System * +Spanner::get_system () 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]->get_system () != spanned_drul_[RIGHT]->get_system ()) return 0; - return spanned_drul_[LEFT]->line_l(); + return spanned_drul_[LEFT]->get_system (); } +Grob * +Spanner::find_broken_piece (System *l) const +{ + vsize idx = binary_search (broken_intos_, (Spanner *) l, Spanner::less); + if (idx != VPOS) + return broken_intos_ [idx]; + return 0; +} -Score_element* -Spanner::find_broken_piece (Line_of_score*l) const +Spanner * +Spanner::broken_neighbor (Direction d) const { - int idx = binsearch_link_array (broken_into_l_arr_, (Spanner*)l, Spanner::compare); - - if (idx < 0) + if (!original_) return 0; - else - return broken_into_l_arr_ [idx]; -} + vsize k = broken_spanner_index (this); + Spanner *orig = dynamic_cast (original_); + int j = int (k) + d; + if (j < 0 || vsize (j) >= orig->broken_intos_.size ()) + return 0; + + return orig->broken_intos_[j]; +} int -Spanner::compare (Spanner * const &p1, Spanner * const &p2) +Spanner::compare (Spanner *const &p1, Spanner *const &p2) { - return p1->line_l ()->rank_i_ - p2->line_l ()->rank_i_; + return p1->get_system ()->get_rank () - p2->get_system ()->get_rank (); } bool -Spanner::broken_b() const +Spanner::less (Spanner *const &a, Spanner *const &b) { - return broken_into_l_arr_.size(); + return a->get_system ()->get_rank () < b->get_system ()->get_rank (); } +bool +Spanner::is_broken () const +{ + return broken_intos_.size (); +} /* If this is a broken spanner, return the amount the left end is to be @@ -286,46 +296,45 @@ 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]->get_column ()); // Relevant only if left span point is first column in line - if(sc != NULL && - sc->break_status_dir () == RIGHT) + 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 sc->extent (sc, X_AXIS)[RIGHT]; } return 0.0; } -SCM -Spanner::do_derived_mark () +void +Spanner::derived_mark () const { - /* - 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); + 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; + for (vsize i = broken_intos_.size (); i--;) + scm_gc_mark (broken_intos_[i]->self_scm ()); } +/* + Set left or right bound to IT. + + Warning: caller should ensure that subsequent calls put in ITems + that are left-to-right ordered. +*/ void -add_bound_item (Spanner* sp, Item*it) +add_bound_item (Spanner *sp, Grob *it) { if (!sp->get_bound (LEFT)) sp->set_bound (LEFT, it); @@ -333,69 +342,117 @@ add_bound_item (Spanner* sp, Item*it) sp->set_bound (RIGHT, it); } -static void -extend_spanner_over_item (Item *it, SCM extremal_pair) +MAKE_SCHEME_CALLBACK (Spanner, set_spacing_rods, 1); +SCM +Spanner::set_spacing_rods (SCM smob) { - if (!it) - return; - Item * col = it->column_l (); - Item * i1 = dynamic_cast (unsmob_element (gh_car (extremal_pair))); - Item * i2 = dynamic_cast (unsmob_element (gh_cdr (extremal_pair))); - int r = Paper_column::rank_i (col); - if (!i1 || r < Paper_column::rank_i (i1->column_l ())) + Grob *me = unsmob_grob (smob); + SCM num_length = me->get_property ("minimum-length"); + if (scm_is_number (num_length)) { - 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 ()); + Rod r; + Spanner *sp = dynamic_cast (me); + System *root = get_root_system (me); + Drul_array bounds (sp->get_bound (LEFT), + sp->get_bound (RIGHT)); + if (!bounds[LEFT] || !bounds[RIGHT]) + return SCM_UNSPECIFIED; + + vector cols (root->broken_col_range (bounds[LEFT]->get_column (), + bounds[RIGHT]->get_column ())); + + if (cols.size ()) + { + Rod r ; + r.item_drul_[LEFT] = sp->get_bound (LEFT); + r.item_drul_[RIGHT] = cols[0]->find_prebroken_piece (LEFT); + r.distance_ = robust_scm2double (num_length, 0); + r.add_to_cols (); + + r.item_drul_[LEFT] = cols.back ()->find_prebroken_piece (RIGHT); + r.item_drul_[RIGHT] = sp->get_bound (RIGHT); + r.add_to_cols (); + } + + r.distance_ = robust_scm2double (num_length, 0); + r.item_drul_[LEFT] = sp->get_bound (LEFT); + r.item_drul_[RIGHT] = sp->get_bound (RIGHT); + r.add_to_cols (); } + + return SCM_UNSPECIFIED; +} + +/* + Return I such that SP == SP->ORIGINAL ()->BROKEN_INTOS_[I]. +*/ +int +broken_spanner_index (Spanner const *sp) +{ + Spanner *parent = dynamic_cast (sp->original ()); + /* ugh: casting */ + return find (parent->broken_intos_, (Spanner*) sp) - parent->broken_intos_.begin (); } -static void -extend_spanner_over_elements (SCM value, SCM extremal_pair) +Spanner * +unsmob_spanner (SCM s) { - 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_element (value)) - { - if (Spanner * sp = dynamic_cast (unsmob_element(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_element(value))) - extend_spanner_over_item (it, extremal_pair); - } + return dynamic_cast (unsmob_grob (s)); } +MAKE_SCHEME_CALLBACK (Spanner, bounds_width, 1); +SCM +Spanner::bounds_width (SCM grob) +{ + Spanner *me = unsmob_spanner (grob); -/* - Make sure that the left and right bounds encompasses all objects it - points to. + Grob *common = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT), X_AXIS); - TODO: maybe be more specific. Most probably fucks up if someone sets - a pointer to the staffsymbol in S -*/ -void -extend_spanner_over_elements (Score_element*s) + Interval w (me->get_bound (LEFT)->relative_coordinate (common, X_AXIS), + me->get_bound (RIGHT)->relative_coordinate (common, X_AXIS)); + + w -= me->relative_coordinate (common, X_AXIS); + + return ly_interval2scm (w); +} + +MAKE_SCHEME_CALLBACK (Spanner, kill_zero_spanned_time, 1); +SCM +Spanner::kill_zero_spanned_time (SCM grob) { - Spanner*sp = dynamic_cast (s); + Spanner *me = unsmob_spanner (grob); + Interval_t moments = me->spanned_time (); + /* + Remove the line or hairpin at the start of the line. For + piano voice indicators, it makes no sense to have them at + the start of the line. - 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); + I'm not sure what the official rules for glissandi are, but + usually the 2nd note of the glissando is "exact", so when playing + from the start of the line, there is no need to glide. + + From a typographical p.o.v. this makes sense, since the amount of + space left of a note at the start of a line is very small. - Score_element *p1 = unsmob_element (gh_car (pair)); - Score_element* p2 = unsmob_element (gh_cdr (pair)); - sp->set_bound (LEFT,p1); - sp->set_bound (RIGHT, p2); + --hwn. - //extra precaution. + */ + if (moments.length () == Moment (0, 0)) + me->suicide (); + + return SCM_UNSPECIFIED; } +ADD_INTERFACE (Spanner, + "Some objects are horizontally spanned between objects. For" + " example, slurs, beams, ties, etc. These grobs form a subtype" + " called @code{Spanner}. All spanners have two span points" + " (these must be @code{Item} objects), one on the left and one" + " on the right. The left bound is also the X@tie{}reference" + " point of the spanner.", + + /* properties */ + "minimum-length " + "to-barline " + ); +