X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=fdc34380a47545dc50772c85c7a0402a9a89cec9;hb=e4c229e52b6e102676b1bcae5aff89bf21401225;hp=3579abefca1efc1d1036d41a9f5141cfc3fe2354;hpb=af9078fd6d63dea5141e87a1b4d7cb5b0bcba84a;p=lilypond.git diff --git a/lily/spanner.cc b/lily/spanner.cc index 3579abefca..fdc34380a4 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -3,21 +3,20 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2004 Han-Wen Nienhuys */ #include #include -#include "debug.hh" +#include "warn.hh" #include "spanner.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 "system.hh" #include "group-interface.hh" void @@ -40,14 +39,14 @@ Spanner::do_break_processing () { 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 ())); + 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 () || broken_b ()) return; if (left == right) @@ -61,22 +60,22 @@ Spanner::do_break_processing () 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_grob (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); } else { - Link_array break_points = pscore_l_->line_l_->broken_col_range (left,right); + Link_array break_points = pscore_->system_->broken_col_range (left,right); break_points.insert (left,0); break_points.push (right); @@ -89,7 +88,7 @@ Spanner::do_break_processing () Direction d = LEFT; do { - if (!bounds[d]->line_l ()) + if (!bounds[d]->get_system ()) bounds[d] = bounds[d]->find_prebroken_piece (- d); } while ((flip (&d))!= LEFT); @@ -100,26 +99,34 @@ Spanner::do_break_processing () 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 ()); + span->set_bound (LEFT,bounds[LEFT]); + span->set_bound (RIGHT,bounds[RIGHT]); - if (!bounds[LEFT]->line_l () + if (!bounds[LEFT]->get_system () - || !bounds[RIGHT]->line_l () - || bounds[LEFT]->line_l () != bounds[RIGHT]->line_l ()) + || !bounds[RIGHT]->get_system () + || bounds[LEFT]->get_system () != bounds[RIGHT]->get_system ()) { programming_error ("bounds of spanner are invalid"); - span_p->suicide (); + span->suicide (); } else { - bounds[LEFT]->line_l ()->typeset_grob (span_p); - broken_into_l_arr_.push (span_p); + 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 @@ -128,7 +135,7 @@ Spanner::set_my_columns () Direction i = (Direction) LEFT; do { - if (!spanned_drul_[i]->line_l ()) + if (!spanned_drul_[i]->get_system ()) set_bound (i,spanned_drul_[i]->find_prebroken_piece ((Direction) -i)); } while (flip (&i) != LEFT); @@ -141,15 +148,16 @@ Spanner::spanned_rank_iv () if (spanned_drul_[LEFT]) { - iv[LEFT] = Paper_column::rank_i (spanned_drul_[LEFT]->column_l ()); + iv[LEFT] = Paper_column::get_rank (spanned_drul_[LEFT]->get_column ()); } if (spanned_drul_[RIGHT]) { - iv[RIGHT] = Paper_column::rank_i (spanned_drul_[RIGHT]->column_l ()); + iv[RIGHT] = Paper_column::get_rank (spanned_drul_[RIGHT]->get_column ()); } return iv; } + Item* Spanner::get_bound (Direction d) const { @@ -173,9 +181,9 @@ Spanner::set_bound (Direction d, Grob*s) 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)) + if (d== LEFT && !dynamic_cast (this)) { set_parent (i, X_AXIS); } @@ -190,15 +198,18 @@ Spanner::set_bound (Direction d, Grob*s) */ if (dynamic_cast (i)) { - Pointer_group_interface::add_element (i, ly_symbol2scm ("bounded-by-me"), this); + Pointer_group_interface::add_grob (i, ly_symbol2scm ("bounded-by-me"), this); } } Spanner::Spanner (SCM s) : Grob (s) { + break_index_ = 0; 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) @@ -219,39 +230,39 @@ Spanner::spanner_length () const 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 (Line_of_score*l) const +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) { - return p1->line_l ()->rank_i_ - p2->line_l ()->rank_i_; + return p1->get_system ()->rank_ - p2->get_system ()->rank_; } bool Spanner::broken_b () const { - return broken_into_l_arr_.size (); + return broken_intos_.size (); } @@ -264,11 +275,11 @@ 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) + sc->break_status_dir () == RIGHT) { /* @@ -283,11 +294,11 @@ Spanner::get_broken_left_end_align () const } SCM -Spanner::do_derived_mark () +Spanner::do_derived_mark () const { /* We'd be fucked if this is called before spanned_drul_[] is inited. */ - if (status_c_ == ORPHAN) + if (status_ == ORPHAN) return SCM_EOL; Direction d = LEFT; @@ -296,89 +307,26 @@ Spanner::do_derived_mark () 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 ()); return SCM_EOL; } -void -add_bound_item (Spanner* sp, Item*it) -{ - if (!sp->get_bound (LEFT)) - sp->set_bound (LEFT, it); - else - sp->set_bound (RIGHT, it); -} /* - Extends EXTREMAL_PAIR to include IT - */ -static void -extend_spanner_over_item (Item *it, SCM extremal_pair) -{ - 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 ()); - } -} + Set left or right bound to IT. -/* - Extends EXTREMAL_PAIR to include every grob in VALUE + Warning: caller should ensure that subsequent calls put in ITems + that are left-to-right ordered. */ -static void -extend_spanner_over_elements (SCM value, SCM extremal_pair) -{ - if (gh_pair_p (value)) - { - 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) +add_bound_item (Spanner* sp, Grob*it) { - 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); + if (!sp->get_bound (LEFT)) + sp->set_bound (LEFT, it); + else + sp->set_bound (RIGHT, it); } @@ -392,10 +340,37 @@ Spanner::set_spacing_rods (SCM smob) 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.distance_ = + robust_scm2double (me->get_grob_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", +"Other grobs have a shape that depends on the horizontal spacing. 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}s), 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");