X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=69251e2a2ab3166d6e84b732061f37ce248cb53b;hb=a286e94740cef413b1460cda2ce9848ad089ca90;hp=9859c2b055f710409f0bc4c0a49822bede88ae8b;hpb=0824dba176ac4991cc7671f18cf920f365100313;p=lilypond.git diff --git a/lily/spanner.cc b/lily/spanner.cc index 9859c2b055..69251e2a2a 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -3,38 +3,30 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2002 Han-Wen Nienhuys + (c) 1996--2004 Han-Wen Nienhuys */ -#include -#include +#include "spanner.hh" + +#include + +#include #include "warn.hh" -#include "spanner.hh" #include "paper-column.hh" #include "paper-score.hh" -#include "molecule.hh" +#include "stencil.hh" #include "paper-outputter.hh" #include "paper-column.hh" #include "system.hh" #include "group-interface.hh" -/* spanner in name? */ -LY_DEFINE (get_broken_into, - "get-broken-into", 1, 0, 0, (SCM spanner), - " -Return broken-into list for @var{spanner}. -" -) + + +Grob * +Spanner::clone (int count) const { - /// Spanner *me = unsmob_spanner (spanner); - Spanner *me = dynamic_cast (unsmob_grob (spanner)); - SCM_ASSERT_TYPE (me, spanner, SCM_ARG1, __FUNCTION__, "spanner"); - - SCM s = SCM_EOL; - for (int i = me->broken_into_l_arr_.size (); i; i--) - s = gh_cons (me->broken_into_l_arr_[i-1]->self_scm (), s); - return s; + return new Spanner (*this, count); } void @@ -55,16 +47,16 @@ Spanner::do_break_processing () { 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'.", - 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 (get_system () || broken_b ()) + if (get_system () || is_broken ()) return; if (left == right) @@ -80,20 +72,20 @@ Spanner::do_break_processing () programming_error ("no broken bound"); 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->get_system ()); - span_p->get_system ()->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_->system_->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); @@ -117,9 +109,9 @@ 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 (broken_intos_.size ())); + span->set_bound (LEFT,bounds[LEFT]); + span->set_bound (RIGHT,bounds[RIGHT]); if (!bounds[LEFT]->get_system () @@ -127,16 +119,24 @@ Spanner::do_break_processing () || bounds[LEFT]->get_system () != bounds[RIGHT]->get_system ()) { programming_error ("bounds of spanner are invalid"); - span_p->suicide (); + span->suicide (); } else { - bounds[LEFT]->get_system ()->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 @@ -156,17 +156,14 @@ 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] = Paper_column::get_rank (spanned_drul_[LEFT]->get_column ()); + if (spanned_drul_[RIGHT] && spanned_drul_[RIGHT]->get_column ()) + iv[RIGHT] = Paper_column::get_rank (spanned_drul_[RIGHT]->get_column ()); return iv; } + Item* Spanner::get_bound (Direction d) const { @@ -211,18 +208,18 @@ Spanner::set_bound (Direction d, Grob*s) } } -Spanner::Spanner (SCM s) - : Grob (s) +Spanner::Spanner (SCM s, Object_key const*key) + : Grob (s, key) { + 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) - : Grob (s) +Spanner::Spanner (Spanner const &s, int count) + : Grob (s, count) { spanned_drul_[LEFT] = spanned_drul_[RIGHT] =0; } @@ -253,25 +250,25 @@ Spanner::get_system () 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) { - return p1->get_system ()->rank_i_ - p2->get_system ()->rank_i_; + return p1->get_system ()->rank_ - p2->get_system ()->rank_; } bool -Spanner::broken_b () const +Spanner::is_broken () const { - return broken_into_l_arr_.size (); + return broken_intos_.size (); } @@ -284,11 +281,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) { /* @@ -303,11 +300,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; @@ -316,8 +313,8 @@ 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; } @@ -349,28 +346,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_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, +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. -", +"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");