X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=2c49aacad7d836e4ba8520fdf53feab8ef2bbc77;hb=8f8b3fb62d5d0776335de899b32aada69457810a;hp=f9cb12f4c1ae7dbaddf0329cfa4c1fb777aafa0a;hpb=3c2f386f1385a10dafbb811be245f5a75d6b132c;p=lilypond.git diff --git a/lily/spanner.cc b/lily/spanner.cc index f9cb12f4c1..2c49aacad7 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -3,54 +3,58 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2005 Han-Wen Nienhuys */ -#include -#include - -#include "debug.hh" #include "spanner.hh" + + +#include "pointer-group-interface.hh" +#include "libc-extension.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 "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_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 ++) + */ + 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 ())) + if (!parent->spanned_rank_iv ().superset (this->spanned_rank_iv ())) { - programming_error (to_str ("Spanner `%s' is not fully contained in parent spanner `%s'.", - classname (this), - classname (parent))); + programming_error (to_string ("Spanner `%s' is not fully contained in parent spanner `%s'.", + name ().to_str0 (), + parent->name ().to_str0 ())); } } } - - 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,181 +62,201 @@ 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 (broken_intos_.size ())); + 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 (span); } } - while ((flip(&d))!= LEFT); + while ((flip (&d)) != LEFT); } else { - Link_array break_points = pscore_l_->line_l_->broken_col_range (left,right); + Link_array break_points = pscore_->root_system ()->broken_col_range (left, right); - break_points.insert (left,0); + 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]; + 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]); - + Spanner *span = dynamic_cast (clone (broken_intos_.size ())); + span->set_bound (LEFT, bounds[LEFT]); + span->set_bound (RIGHT, bounds[RIGHT]); - assert (bounds[LEFT]->line_l () == - bounds[RIGHT]->line_l ()); + if (!bounds[LEFT]->get_system () - bounds[LEFT]->line_l ()->typeset_element (span_p); - broken_into_l_arr_.push (span_p); + || !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_into_l_arr_.sort (Spanner::compare); + broken_intos_.sort (Spanner::compare); + for (int i = broken_intos_.size ();i--;) + broken_intos_[i]->break_index_ = i; +} + +int +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 () { 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* +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::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"); 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 + 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] -Spanner::Spanner (SCM s) - : Score_element (s) -{ - spanned_drul_[LEFT]=0; - spanned_drul_[RIGHT]=0; + */ + if (dynamic_cast (i)) + Pointer_group_interface::add_grob (i, ly_symbol2scm ("bounded-by-me"), this); } -Spanner::Spanner (Spanner const &s) - : Score_element (s) +Spanner::Spanner (SCM s, Object_key const *key) + : Grob (s, key) { - spanned_drul_[LEFT] = spanned_drul_[RIGHT] =0; + break_index_ = 0; + spanned_drul_[LEFT] = 0; + spanned_drul_[RIGHT] = 0; } +Spanner::Spanner (Spanner const &s, int count) + : Grob (s, count) +{ + 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); - 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 (); } - -Score_element* -Spanner::find_broken_piece (Line_of_score*l) const +Grob * +Spanner::find_broken_piece (System *l) const { - int idx = binsearch_link_array (broken_into_l_arr_, (Spanner*)l, Spanner::compare); - + int idx = binsearch_links (broken_intos_, (Spanner *)l, Spanner::compare); + if (idx < 0) return 0; else - return broken_into_l_arr_ [idx]; + return broken_intos_ [idx]; } - 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::is_broken () const { - return broken_into_l_arr_.size(); + 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 @@ -242,42 +266,90 @@ 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; } void -Spanner::do_derived_mark () +Spanner::derived_mark () const { Direction d = LEFT; do if (spanned_drul_[d]) - scm_gc_mark (spanned_drul_[d]->self_scm_); - while (flip (&d) != LEFT); + 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_); + for (int 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); 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); + r.distance_ + = robust_scm2double (me->get_property ("minimum-length"), 0); + + r.add_to_cols (); + return SCM_UNSPECIFIED; +} + +/* + Return I such that SP == SP->ORIGINAL ()->BROKEN_INTOS_[I]. +*/ +int +broken_spanner_index (Spanner *sp) +{ + Spanner *parent = dynamic_cast (sp->original ()); + return parent->broken_intos_.find_index (sp); +} + +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");