X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=8e4b060774c45a55762733c9d184683d76781870;hb=38269bfebef7893a1bd82fd2182155f77a59e5a7;hp=01a02cf8d44e7bd408037b11f35fa45ed931fe35;hpb=6a62932652940f4ac2931f75d48796887fbc5fdc;p=lilypond.git diff --git a/lily/spanner.cc b/lily/spanner.cc index 01a02cf8d4..8e4b060774 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -3,139 +3,356 @@ source file of the GNU LilyPond music typesetter - (c) 1996,1997 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ +#include +#include -#include "debug.hh" + +#include "warn.hh" #include "spanner.hh" -#include "p-col.hh" -#include "p-score.hh" +#include "paper-column.hh" +#include "paper-score.hh" +#include "molecule.hh" +#include "paper-outputter.hh" +#include "paper-column.hh" +#include "system.hh" +#include "group-interface.hh" +void +Spanner::do_break_processing () +{ + //break_into_pieces + Item * left = spanned_drul_[LEFT]; + Item * right = spanned_drul_[RIGHT]; -IMPLEMENT_IS_TYPE_B1(Spanner,Score_elem); + 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 ().contains_b (this->spanned_rank_iv ())) + { + programming_error (to_string ("Spanner `%s' is not fully contained in parent spanner `%s'.", + name ().to_str0 (), + parent->name ().to_str0 ())); + } + } + } + + if (get_system () || broken_b ()) + return; -void -Spanner::do_print()const -{ -#ifndef NPRINT - mtor << "Between col "; - if ( left_col_l_ ) - mtor << left_col_l_->rank_i(); - else - mtor << "nop"; - mtor << ", "; - if ( right_col_l_ ) - mtor << right_col_l_->rank_i(); - else - mtor << "nop"; - if (broken_into_l_arr_.size()) - mtor << "with broken pieces\n"; -#endif -} + 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 ()); + span->set_bound (LEFT, bound); + span->set_bound (RIGHT, bound); -void -Spanner::break_into_pieces(bool copy_deps_b) -{ - if ( broken_into_l_arr_.size() ) - return; - - 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(); - if (copy_deps_b) - span_p->copy_dependencies( *this ); - 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 ); + assert (span->get_system ()); + span->get_system ()->typeset_grob (span); + broken_intos_.push (span); + } + } + while ((flip (&d))!= LEFT); } - - broken_into_l_arr_ = broken_into_l_arr; + else + { + Link_array break_points = pscore_->system_->broken_col_range (left,right); + + break_points.insert (left,0); + break_points.push (right); + + 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]->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 ()); + 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 (span); + } + } + } + broken_intos_.sort (Spanner::compare); } void -Spanner::set_my_columns() +Spanner::set_my_columns () { - 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_; + Direction i = (Direction) LEFT; + do + { + 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 () +{ + Interval_t iv (0, 0); + + if (spanned_drul_[LEFT]) + { + iv[LEFT] = Paper_column::get_rank (spanned_drul_[LEFT]->get_column ()); + } + if (spanned_drul_[RIGHT]) + { + iv[RIGHT] = Paper_column::get_rank (spanned_drul_[RIGHT]->get_column ()); + } + 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() +Spanner::set_bound (Direction d, Grob*s) { - set_my_columns(); + 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 (!line_l()) { - break_into_pieces(true); - for (int i=0; i < broken_into_l_arr_.size(); i++) - broken_into_l_arr_[i]->handle_broken_dependencies(); - } else { - handle_broken_dependencies(); + */ + if (dynamic_cast (i)) + { + Pointer_group_interface::add_grob (i, ly_symbol2scm ("bounded-by-me"), this); } } +Spanner::Spanner (SCM s) + : Grob (s) +{ + spanned_drul_[LEFT]=0; + spanned_drul_[RIGHT]=0; + Group_interface::add_thing (this, ly_symbol2scm ("interfaces"), ly_symbol2scm ("spanner-interface")); + + +} + +Spanner::Spanner (Spanner const &s) + : Grob (s) +{ + 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"); + + return r-l; +} + +System * +Spanner::get_system () const +{ + 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 (); +} + -Spanner::Spanner() +Grob* +Spanner::find_broken_piece (System*l) const { - left_col_l_ = right_col_l_ = 0; + int idx = binsearch_links (broken_intos_, (Spanner*)l, Spanner::compare); + + if (idx < 0) + return 0; + else + return broken_intos_ [idx]; } -Interval -Spanner::do_width()const +int +Spanner::compare (Spanner * const &p1, Spanner * const &p2) { - Real r = right_col_l_->hpos_f_; - Real l = left_col_l_->hpos_f_; - assert(*left_col_l_ < *right_col_l_); - assert(r>=l); + return p1->get_system ()->rank_ - p2->get_system ()->rank_; +} + +bool +Spanner::broken_b () 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 +{ + 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) + { + /* - return Interval(0, r-l); + 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; } -Line_of_score * -Spanner::line_l()const +SCM +Spanner::do_derived_mark () { - if ( left_col_l_->line_l_ != right_col_l_->line_l_) - return 0; - return left_col_l_->line_l_; + /* + We'd be fucked if this is called before spanned_drul_[] is inited. */ + if (status_ == 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_intos_.size () ; i--;) + scm_gc_mark (broken_intos_[i]->self_scm ()); + + return SCM_EOL; } -Spanner* -Spanner::find_broken_piece(Line_of_score*l)const +/* + 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) { - 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; - + if (!sp->get_bound (LEFT)) + sp->set_bound (LEFT, it); + else + sp->set_bound (RIGHT, it); } -bool -Spanner::broken_b()const + +MAKE_SCHEME_CALLBACK (Spanner,set_spacing_rods,1); +SCM +Spanner::set_spacing_rods (SCM smob) { - return broken_into_l_arr_.size(); + 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_ = + 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)); +} + +ADD_INTERFACE(Spanner, + "spanner-interface", + " +Other grobs have a shape that depends on the horizontal spacing. For +example, slur, beam, tie, etc. These grobs form a subtype called +@code{Spanner}. All spanners have two span-points (these must be +@code{Item}s), one on the left and one on the right. The left bound is +also the X-reference point of the spanner. +", + "minimum-length");