X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=c620ab64a32b19a72d291d557e2e616342e86617;hb=b0a5fb6a91d114970620a3e2f0203904ed5da85a;hp=f66aa494975353acd92fa4a379d11ac214e135a5;hpb=90d3ec050c58d6fa91f668dd6ca1ae8f16df20c3;p=lilypond.git diff --git a/lily/spanner.cc b/lily/spanner.cc index f66aa49497..955ba76ef3 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -3,121 +3,379 @@ source file of the GNU LilyPond music typesetter - (c) 1996,1997 Han-Wen Nienhuys + (c) 1996--2006 Han-Wen Nienhuys */ -#include "debug.hh" #include "spanner.hh" -#include "p-col.hh" -#include "p-score.hh" -IMPLEMENT_STATIC_NAME(Spanner); -IMPLEMENT_IS_TYPE_B1(Spanner,Score_elem); + +#include "pointer-group-interface.hh" +#include "libc-extension.hh" +#include "paper-column.hh" +#include "paper-column.hh" +#include "paper-score.hh" +#include "stencil.hh" +#include "system.hh" +#include "warn.hh" + +Grob * +Spanner::clone (int count) const +{ + return new Spanner (*this, count); +} void -Spanner::do_print()const +Spanner::do_break_processing () +{ + //break_into_pieces + 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 (get_parent ((Axis)a))) + { + if (!parent->spanned_rank_iv ().superset (this->spanned_rank_iv ())) + { + programming_error (to_string ("Spanner `%s' is not fully contained in parent spanner `%s'.", + name ().c_str (), + parent->name ().c_str ())); + } + } + } + + if (get_system () || is_broken ()) + return; + + if (left == right) + { + /* + 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_prebroken_piece (d); + if (!bound) + programming_error ("no broken bound"); + else if (bound->get_system ()) + { + Spanner *span = dynamic_cast (clone (broken_intos_.size ())); + span->set_bound (LEFT, bound); + span->set_bound (RIGHT, bound); + + assert (span->get_system ()); + span->get_system ()->typeset_grob (span); + broken_intos_.push_back (span); + } + } + while ((flip (&d)) != LEFT); + } + else + { + System *root = get_root_system (this); + vector break_points = root->broken_col_range (left, right); + + break_points.insert (break_points.begin () + 0, left); + break_points.push_back (right); + + 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]->get_system ()) + 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 = dynamic_cast (clone (broken_intos_.size ())); + 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 ()) + { + programming_error ("bounds of spanner are invalid"); + span->suicide (); + } + else + { + bounds[LEFT]->get_system ()->typeset_grob (span); + broken_intos_.push_back (span); + } + } + } + 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 { -#ifndef NPRINT - mtor << "Between col " << - left_col_l_->rank_i() << ", " << right_col_l_->rank_i() ; - if (broken_into_l_arr_.size()) - mtor << "with broken pieces\n"; -#endif + return break_index_; } void -Spanner::break_into_pieces() -{ - PCol * left = left_col_l_; - PCol * right = right_col_l_; - if(left->daddy_l_) left = left->daddy_l_; - if(right->daddy_l_) right = right->daddy_l_; - - - Link_array break_cols = pscore_l_->broken_col_range(left,right); - Link_array broken_into_l_arr; - - break_cols.insert(left,0); - break_cols.push(right); - - for (int i=1; i < break_cols.size(); i++) { - Spanner* span_p = clone()->spanner(); - left = break_cols[i-1]; - right = break_cols[i]; - if (!right->line_l_) - right = right->prebreak_p_; - if (!left->line_l_) - left = left->postbreak_p_; - - assert(left&&right && left->line_l_ == right->line_l_); - - span_p->left_col_l_ = left; - span_p->right_col_l_ = right; - - pscore_l_->typeset_broken_spanner(span_p); - broken_into_l_arr.push( span_p ); +Spanner::set_my_columns () +{ + Direction i = (Direction) LEFT; + do + { + if (!spanned_drul_[i]->get_system ()) + set_bound (i, spanned_drul_[i]->find_prebroken_piece ((Direction) -i)); } - - broken_into_l_arr_ = broken_into_l_arr; + while (flip (&i) != LEFT); } +Interval_t +Spanner::spanned_rank_iv () +{ + Interval_t iv (0, 0); + + 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 * +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::do_break_processing() -{ - if (!left_col_l_->line_l_) - left_col_l_ = left_col_l_->postbreak_p_; - if (!right_col_l_->line_l_) - right_col_l_ = right_col_l_->prebreak_p_; - - - if (!line_l()) { - break_into_pieces(); - for (int i=0; i < broken_into_l_arr_.size(); i++) - broken_into_l_arr_[i]->handle_broken_dependencies(); - } else { - handle_broken_dependencies(); +Spanner::set_bound (Direction d, Grob *s) +{ + Item *i = dynamic_cast (s); + if (!i) + { + programming_error ("must have Item for spanner bound"); + return; } + + spanned_drul_[d] = i; + + /** + 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); + + /* + 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, Object_key const *key) + : Grob (s, key) +{ + break_index_ = 0; + spanned_drul_[LEFT] = 0; + spanned_drul_[RIGHT] = 0; +} -Spanner::Spanner() +Spanner::Spanner (Spanner const &s, int count) + : Grob (s, count) { - left_col_l_ = right_col_l_ = 0; + spanned_drul_[LEFT] = spanned_drul_[RIGHT] = 0; } +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) + programming_error ("spanner with negative length"); -Interval -Spanner::do_width()const + return r - l; +} + +System * +Spanner::get_system () const { - Real r = right_col_l_->hpos; - Real l = left_col_l_->hpos; - assert(*left_col_l_ < *right_col_l_); - assert(r>=l); - - return Interval(0, r-l); + if (!spanned_drul_[LEFT] || !spanned_drul_[RIGHT]) + return 0; + if (spanned_drul_[LEFT]->get_system () != spanned_drul_[RIGHT]->get_system ()) + return 0; + return spanned_drul_[LEFT]->get_system (); } -Line_of_score * -Spanner::line_l()const +Grob * +Spanner::find_broken_piece (System *l) const { - if ( left_col_l_->line_l_ != right_col_l_->line_l_) - return 0; - return left_col_l_->line_l_; + vsize idx = binary_search (broken_intos_, (Spanner *)l, Spanner::less); + if (idx != VPOS) + return broken_intos_ [idx]; + return 0; } +Spanner * +Spanner::broken_neighbor (Direction d) const +{ + if (!original_) + return 0; -Spanner* -Spanner::find_broken_piece(Line_of_score*l)const + 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) { - 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]; - return 0; - + 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 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 + 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 { - return broken_into_l_arr_.size(); + 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) + { + /* + 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 (sc, X_AXIS)[RIGHT]; + } + + return 0.0; } + +void +Spanner::derived_mark () const +{ + Direction d = LEFT; + do + if (spanned_drul_[d]) + scm_gc_mark (spanned_drul_[d]->self_scm ()); + while (flip (&d) != LEFT) + ; + + 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, Grob *it) +{ + if (!sp->get_bound (LEFT)) + sp->set_bound (LEFT, it); + else + sp->set_bound (RIGHT, it); +} + +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_drul_[LEFT] = sp->get_bound (LEFT); + r.item_drul_[RIGHT] = sp->get_bound (RIGHT); + + SCM num_length = me->get_property ("minimum-length"); + if (scm_is_number (num_length)) + { + r.distance_ = robust_scm2double (num_length, 0); + 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 (); +} + +Spanner * +unsmob_spanner (SCM s) +{ + return dynamic_cast (unsmob_grob (s)); +} + +ADD_INTERFACE (Spanner, + "spanner-interface", + "Some objects are horizontally spanned between objects. For\n" + "example, slur, beam, tie, etc. These grobs form a subtype called\n" + "@code{Spanner}. All spanners have two span-points (these must be\n" + "@code{Item} objects), one on the left and one on the right. The left bound is\n" + "also the X-reference point of the spanner.\n", + "minimum-length"); +