X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=476f75d8c26e8da85be44c334e3ca6fd18641149;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=d5eaa3aaa45aefd53be682475f81c7f3d7350c59;hpb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;p=lilypond.git diff --git a/lily/spanner.cc b/lily/spanner.cc index d5eaa3aaa4..476f75d8c2 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -3,13 +3,9 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2005 Han-Wen Nienhuys + (c) 1996--2008 Han-Wen Nienhuys */ -#include "spanner.hh" - -#include - #include "pointer-group-interface.hh" #include "libc-extension.hh" #include "paper-column.hh" @@ -18,11 +14,12 @@ #include "stencil.hh" #include "system.hh" #include "warn.hh" +#include "moment.hh" Grob * -Spanner::clone (int count) const +Spanner::clone () const { - return new Spanner (*this, count); + return new Spanner (*this); } void @@ -35,22 +32,6 @@ Spanner::do_break_processing () 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 ().to_str0 (), - parent->name ().to_str0 ())); - } - } - } if (get_system () || is_broken ()) return; @@ -68,25 +49,41 @@ Spanner::do_break_processing () programming_error ("no broken bound"); else if (bound->get_system ()) { - Spanner *span = dynamic_cast (clone (broken_intos_.size ())); + Spanner *span = dynamic_cast (clone ()); span->set_bound (LEFT, bound); span->set_bound (RIGHT, bound); assert (span->get_system ()); span->get_system ()->typeset_grob (span); - broken_intos_.push (span); + broken_intos_.push_back (span); } } while ((flip (&d)) != LEFT); } else { - Link_array break_points = pscore_->root_system ()->broken_col_range (left, right); + System *root = get_root_system (this); + vector break_points = root->broken_col_range (left, right); - break_points.insert (left, 0); - break_points.push (right); + break_points.insert (break_points.begin () + 0, left); + break_points.push_back (right); - for (int i = 1; i < break_points.size (); i++) + Slice parent_rank_slice; + parent_rank_slice.set_full (); + + /* + 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))) + { + parent_rank_slice.intersect (parent->spanned_rank_interval ()); + } + } + + for (vsize i = 1; i < break_points.size (); i++) { Drul_array bounds; bounds[LEFT] = break_points[i - 1]; @@ -105,7 +102,18 @@ Spanner::do_break_processing () continue; } - Spanner *span = dynamic_cast (clone (broken_intos_.size ())); + bool ok = parent_rank_slice.contains (bounds[LEFT]->get_column ()->get_rank ()); + ok = ok && parent_rank_slice.contains (bounds[RIGHT]->get_column ()->get_rank ()); + + if (!ok) + { + programming_error (to_string ("Spanner `%s' is not fully contained in parent spanner. Ignoring orphaned part", + name ().c_str ())); + continue; + } + + + Spanner *span = dynamic_cast (clone ()); span->set_bound (LEFT, bounds[LEFT]); span->set_bound (RIGHT, bounds[RIGHT]); @@ -120,16 +128,16 @@ Spanner::do_break_processing () else { bounds[LEFT]->get_system ()->typeset_grob (span); - broken_intos_.push (span); + broken_intos_.push_back (span); } } } - broken_intos_.sort (Spanner::compare); - for (int i = broken_intos_.size ();i--;) + vector_sort (broken_intos_, Spanner::less); + for (vsize i = broken_intos_.size (); i--;) broken_intos_[i]->break_index_ = i; } -int +vsize Spanner::get_break_index () const { return break_index_; @@ -148,7 +156,7 @@ Spanner::set_my_columns () } Interval_t -Spanner::spanned_rank_iv () +Spanner::spanned_rank_interval () const { Interval_t iv (0, 0); @@ -159,6 +167,14 @@ Spanner::spanned_rank_iv () return iv; } +Interval_t +Spanner::spanned_time () const +{ + return spanned_time_interval (spanned_drul_[LEFT], + spanned_drul_[RIGHT]); +} + + Item * Spanner::get_bound (Direction d) const { @@ -175,7 +191,7 @@ Spanner::set_bound (Direction d, Grob *s) Item *i = dynamic_cast (s); if (!i) { - programming_error ("must have Item for spanner bound"); + programming_error ("must have Item for spanner bound of " + name()); return; } @@ -185,9 +201,7 @@ Spanner::set_bound (Direction d, Grob *s) 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); - } + set_parent (i, X_AXIS); /* Signal that this column needs to be kept alive. They need to be @@ -198,21 +212,19 @@ Spanner::set_bound (Direction d, Grob *s) */ if (dynamic_cast (i)) - { - Pointer_group_interface::add_grob (i, ly_symbol2scm ("bounded-by-me"), this); - } + Pointer_group_interface::add_grob (i, ly_symbol2scm ("bounded-by-me"), this); } -Spanner::Spanner (SCM s, Object_key const *key) - : Grob (s, key) +Spanner::Spanner (SCM s) + : Grob (s) { break_index_ = 0; spanned_drul_[LEFT] = 0; spanned_drul_[RIGHT] = 0; } -Spanner::Spanner (Spanner const &s, int count) - : Grob (s, count) +Spanner::Spanner (Spanner const &s) + : Grob (s) { spanned_drul_[LEFT] = spanned_drul_[RIGHT] = 0; } @@ -242,12 +254,25 @@ Spanner::get_system () const Grob * Spanner::find_broken_piece (System *l) const { - int idx = binsearch_links (broken_intos_, (Spanner *)l, Spanner::compare); + vsize idx = binary_search (broken_intos_, (Spanner *)l, Spanner::less); + if (idx != VPOS) + return broken_intos_ [idx]; + return 0; +} - if (idx < 0) +Spanner * +Spanner::broken_neighbor (Direction d) const +{ + if (!original_) return 0; - else - return broken_intos_ [idx]; + + 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 @@ -256,6 +281,12 @@ Spanner::compare (Spanner *const &p1, Spanner *const &p2) return p1->get_system ()->get_rank () - p2->get_system ()->get_rank (); } +bool +Spanner::less (Spanner *const &a, Spanner *const &b) +{ + return a->get_system ()->get_rank () < b->get_system ()->get_rank (); +} + bool Spanner::is_broken () const { @@ -298,7 +329,7 @@ Spanner::derived_mark () const while (flip (&d) != LEFT) ; - for (int i = broken_intos_.size (); i--;) + for (vsize i = broken_intos_.size (); i--;) scm_gc_mark (broken_intos_[i]->self_scm ()); } @@ -322,26 +353,51 @@ 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 (); + SCM num_length = me->get_property ("minimum-length"); + if (scm_is_number (num_length)) + { + Rod r; + Spanner *sp = dynamic_cast (me); + System *root = get_root_system (me); + Drul_array bounds (sp->get_bound (LEFT), + sp->get_bound (RIGHT)); + if (!bounds[LEFT] || !bounds[RIGHT]) + return SCM_UNSPECIFIED; + + vector cols (root->broken_col_range (bounds[LEFT]->get_column (), + bounds[RIGHT]->get_column ())); + + if (cols.size ()) + { + Rod r ; + r.item_drul_[LEFT] = sp->get_bound (LEFT); + r.item_drul_[RIGHT] = cols[0]->find_prebroken_piece (LEFT); + r.distance_ = robust_scm2double (num_length, 0); + r.add_to_cols (); + + r.item_drul_[LEFT] = cols.back ()->find_prebroken_piece (RIGHT); + r.item_drul_[RIGHT] = sp->get_bound (RIGHT); + r.add_to_cols (); + } + + r.distance_ = robust_scm2double (num_length, 0); + r.item_drul_[LEFT] = sp->get_bound (LEFT); + r.item_drul_[RIGHT] = sp->get_bound (RIGHT); + r.add_to_cols (); + } + return SCM_UNSPECIFIED; } /* - Return I such that SP == SP->ORIGINAL_->BROKEN_INTOS_[I]. + Return I such that SP == SP->ORIGINAL ()->BROKEN_INTOS_[I]. */ int -broken_spanner_index (Spanner *sp) +broken_spanner_index (Spanner const *sp) { - Spanner *parent = dynamic_cast (sp->original_); - return parent->broken_intos_.find_index (sp); + Spanner *parent = dynamic_cast (sp->original ()); + /* ugh: casting */ + return find (parent->broken_intos_, (Spanner*) sp) - parent->broken_intos_.begin (); } Spanner * @@ -350,11 +406,33 @@ unsmob_spanner (SCM s) return dynamic_cast (unsmob_grob (s)); } +MAKE_SCHEME_CALLBACK (Spanner, bounds_width, 1); +SCM +Spanner::bounds_width (SCM grob) +{ + Spanner *me = unsmob_spanner (grob); + + + Grob *common = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT), X_AXIS); + + Interval w (me->get_bound (LEFT)->relative_coordinate (common, X_AXIS), + me->get_bound (RIGHT)->relative_coordinate (common, X_AXIS)); + + w -= me->relative_coordinate (common, X_AXIS); + + return ly_interval2scm (w); +} + 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"); + "Some objects are horizontally spanned between objects. For" + " example, slurs, beams, ties, etc. These grobs form a subtype" + " called @code{Spanner}. All spanners have two span points" + " (these must be @code{Item} objects), one on the left and one" + " on the right. The left bound is also the X@tie{}reference" + " point of the spanner.", + + /* properties */ + "minimum-length " + "to-barline " + ); +