X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=d8c0e49935c5a676f1fcdbf43b9765c00a170ad2;hb=d9b43b93f2c885409bafdb157138158f65cc49aa;hp=2248bf046f3e52431911e45c451fd76c0829b23c;hpb=afa5829cd270e1b0c616b7ba5c5e6cdc0e920e5f;p=lilypond.git diff --git a/lily/spanner.cc b/lily/spanner.cc index 2248bf046f..d8c0e49935 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -3,215 +3,406 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--1998 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ +#include +#include + #include "debug.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" - - - -void -Spanner::do_print() const -{ -#ifndef NPRINT - DOUT << "Between " << classname (spanned_drul_[LEFT]) - << " and " << classname (spanned_drul_[RIGHT]) << '\n'; - if (broken_into_l_arr_.size()) - { - DOUT << "with broken pieces:\n"; - for (int i=0; i < broken_into_l_arr_.size (); i++) - broken_into_l_arr_[i]->print (); - } -#endif -} +#include "paper-column.hh" +#include "line-of-score.hh" +#include "break-align-item.hh" +#include "group-interface.hh" void -Spanner::break_into_pieces () +Spanner::do_break_processing () { - if (broken_into_l_arr_.size()) - return; - + //break_into_pieces Item * left = spanned_drul_[LEFT]; Item * right = spanned_drul_[RIGHT]; + + if (!left || !right) + return; - if (left == right) + /* + Check if our parent in X-direction spans equally wide + or wider than we do. + */ + for (int a = X_AXIS; a < NO_AXES; a ++) { - warning (_ ("left spanpoint is right spanpoint\n")); - return; + 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'.", + name ().ch_C (), + parent->name ().ch_C ())); + } + } } - Link_array break_cols = pscore_l_->broken_col_range (left,right); - Link_array broken_into_l_arr; + if (line_l () || broken_b ()) + return; - break_cols.insert (left,0); - break_cols.push (right); + 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->line_l ()) + { + Spanner * span_p = dynamic_cast (clone ()); + span_p->set_bound (LEFT, bound); + span_p->set_bound (RIGHT, bound); - for (int i=1; i < break_cols.size(); i++) + 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 { - Spanner* span_p = dynamic_cast (clone()); - Item *left = break_cols[i-1]; - Item *right = break_cols[i]; - if (!right->line_l()) - right = right->find_prebroken_piece(LEFT); - if (!left->line_l()) - left = left->find_prebroken_piece(RIGHT); - - assert (left&&right && left->line_l() == right->line_l()); - - span_p->set_bounds(LEFT,left); - span_p->set_bounds(RIGHT,right); - - pscore_l_->typeset_broken_spanner (span_p); - broken_into_l_arr.push (span_p); + Link_array break_points = pscore_l_->line_l_->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]->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]); + + 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_ = broken_into_l_arr; + broken_into_l_arr_.sort (Spanner::compare); } void -Spanner::set_my_columns() +Spanner::set_my_columns () { - Direction i = (Direction)1; + Direction i = (Direction) LEFT; do { - if (!spanned_drul_[i]->line_l()) - set_bounds(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) != 1); + while (flip (&i) != LEFT); } - -void -Spanner::set_bounds(Direction d, Item*i) +Interval_t +Spanner::spanned_rank_iv () { - if (spanned_drul_[d]) - spanned_drul_[d]->attached_span_l_arr_.substitute(this,0); - - spanned_drul_[d] =i; - if (i) - i->attached_span_l_arr_.push(this); + Interval_t iv (0, 0); - if (spanned_drul_[Direction(-d)] == spanned_drul_[d] - && i) - warning (_f ("Spanner `%s\' with equal left and right spanpoints", classname (this))); + 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 +{ + 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) { - if (!line_l()) + Item * i = dynamic_cast (s); + if (!i) { - break_into_pieces (); - for (int i=0; i < broken_into_l_arr_.size(); i++) - { - broken_into_l_arr_[i]->handle_broken_dependencies(); - } + programming_error ("Must have Item for spanner bound."); + return; } - else + + spanned_drul_[d] =i; + + /** + 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); + } + + /* + 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)) { - handle_broken_dependencies(); + Pointer_group_interface::add_grob (i, ly_symbol2scm ("bounded-by-me"), this); } } -Spanner::Spanner () +Spanner::Spanner (SCM s) + : Grob (s) { - unbroken_original_l_ =0; 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; - unbroken_original_l_ = &s; } -void -Spanner::output_processing () -{ - if (transparent_b_) - return ; - output_p_ = do_brew_molecule_p (); - Offset left_off (spanned_drul_[LEFT]->absolute_coordinate(X_AXIS), 0); - Offset o = absolute_offset() + left_off; - pscore_l_->outputter_l_->output_molecule (output_p_, o, classname (this)); -} +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); -Interval -Spanner::do_width() const -{ - Real l = spanned_drul_[LEFT]->absolute_coordinate (X_AXIS); - Real r = spanned_drul_[RIGHT]->absolute_coordinate (X_AXIS); - assert (r>=l); - - return Interval (0, r-l); + if (r< l) + programming_error ("spanner with negative length"); + + return r-l; } 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()) + 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 (); } -Spanner* +Grob* Spanner::find_broken_piece (Line_of_score*l) const { - 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; - + int idx = binsearch_link_array (broken_into_l_arr_, (Spanner*)l, Spanner::compare); + + if (idx < 0) + return 0; + else + return broken_into_l_arr_ [idx]; +} + + +int +Spanner::compare (Spanner * const &p1, Spanner * const &p2) +{ + return p1->line_l ()->rank_i_ - p2->line_l ()->rank_i_; } bool -Spanner::broken_b() const +Spanner::broken_b () const { - return broken_into_l_arr_.size(); + return broken_into_l_arr_.size (); } -void -Spanner::do_unlink() + +/* + 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 { - set_bounds (LEFT, 0); - set_bounds (RIGHT, 0); + Paper_column *sc = dynamic_cast (spanned_drul_[LEFT]->column_l ()); - if (unbroken_original_l_) + // Relevant only if left span point is first column in line + if (sc != NULL && + sc->break_status_dir () == RIGHT) { - unbroken_original_l_->broken_into_l_arr_.substitute (this, 0); - unbroken_original_l_ =0; + /* + + 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; +} + +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 ()); + 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 -Spanner::do_junk_links() +add_bound_item (Spanner* sp, Item*it) { - spanned_drul_[LEFT] = spanned_drul_[RIGHT] =0; + if (!sp->get_bound (LEFT)) + sp->set_bound (LEFT, it); + else + sp->set_bound (RIGHT, it); } -Array -Spanner::get_rods () const +/* + Extends EXTREMAL_PAIR to include IT + */ +static void +extend_spanner_over_item (Item *it, SCM extremal_pair) { - Array r; - return r; + 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 ()); + } } -void -Spanner::do_space_processing () +/* + Extends EXTREMAL_PAIR to include every grob in VALUE + */ +static void +extend_spanner_over_elements (SCM value, SCM extremal_pair) { - Array rs (get_rods ()); - for (int i=0; i < rs.size (); i++) + if (gh_pair_p (value)) { - rs[i].add_to_cols (); + 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)); }