X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=12346042df772cbb88f0b4380470ba0a1fe14391;hb=d8a0cd4ba54a7a1911364919d195b31bebcb3935;hp=e1fe55efe1d04d6ee65ea6e0ce80ad5f9b94bbbd;hpb=aa16b015cdec74f99b31aceb12ff4b33443b38a0;p=lilypond.git diff --git a/lily/spanner.cc b/lily/spanner.cc index e1fe55efe1..12346042df 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -3,14 +3,14 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2007 Han-Wen Nienhuys + (c) 1996--2009 Han-Wen Nienhuys */ -#include "pointer-group-interface.hh" #include "libc-extension.hh" -#include "paper-column.hh" +#include "moment.hh" #include "paper-column.hh" #include "paper-score.hh" +#include "pointer-group-interface.hh" #include "stencil.hh" #include "system.hh" #include "warn.hh" @@ -31,22 +31,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 ().c_str (), - parent->name ().c_str ())); - } - } - } if (get_system () || is_broken ()) return; @@ -83,6 +67,19 @@ Spanner::do_break_processing () break_points.insert (break_points.begin () + 0, left); break_points.push_back (right); + 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; @@ -102,12 +99,22 @@ Spanner::do_break_processing () continue; } + 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]); if (!bounds[LEFT]->get_system () - || !bounds[RIGHT]->get_system () || bounds[LEFT]->get_system () != bounds[RIGHT]->get_system ()) { @@ -145,7 +152,7 @@ Spanner::set_my_columns () } Interval_t -Spanner::spanned_rank_iv () +Spanner::spanned_rank_interval () const { Interval_t iv (0, 0); @@ -156,10 +163,18 @@ 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 { - return spanned_drul_ [d]; + return spanned_drul_[d]; } /* @@ -172,7 +187,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; } @@ -190,7 +205,6 @@ Spanner::set_bound (Direction d, Grob *s) [maybe we should try keeping all columns alive?, and perhaps inherit position from their (non-)musical brother] - */ if (dynamic_cast (i)) Pointer_group_interface::add_grob (i, ly_symbol2scm ("bounded-by-me"), this); @@ -200,14 +214,13 @@ Spanner::Spanner (SCM s) : Grob (s) { break_index_ = 0; - spanned_drul_[LEFT] = 0; - spanned_drul_[RIGHT] = 0; + spanned_drul_.set (0, 0); } Spanner::Spanner (Spanner const &s) : Grob (s) { - spanned_drul_[LEFT] = spanned_drul_[RIGHT] = 0; + spanned_drul_.set (0, 0); } Real @@ -235,7 +248,7 @@ Spanner::get_system () const Grob * Spanner::find_broken_piece (System *l) const { - vsize idx = binary_search (broken_intos_, (Spanner *)l, Spanner::less); + vsize idx = binary_search (broken_intos_, (Spanner *) l, Spanner::less); if (idx != VPOS) return broken_intos_ [idx]; return 0; @@ -339,11 +352,14 @@ Spanner::set_spacing_rods (SCM smob) { Rod r; Spanner *sp = dynamic_cast (me); - - System *root = get_root_system (me); - vector cols (root->broken_col_range (sp->get_bound (LEFT)->get_column (), - sp->get_bound (RIGHT)->get_column ())); + 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 ()) { @@ -384,13 +400,12 @@ unsmob_spanner (SCM s) return dynamic_cast (unsmob_grob (s)); } -MAKE_SCHEME_CALLBACK(Spanner, bounds_width, 1); +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), @@ -401,13 +416,43 @@ Spanner::bounds_width (SCM grob) return ly_interval2scm (w); } -ADD_INTERFACE (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", +MAKE_SCHEME_CALLBACK (Spanner, kill_zero_spanned_time, 1); +SCM +Spanner::kill_zero_spanned_time (SCM grob) +{ + Spanner *me = unsmob_spanner (grob); + Interval_t moments = me->spanned_time (); + /* + Remove the line or hairpin at the start of the line. For + piano voice indicators, it makes no sense to have them at + the start of the line. + + I'm not sure what the official rules for glissandi are, but + usually the 2nd note of the glissando is "exact", so when playing + from the start of the line, there is no need to glide. + From a typographical p.o.v. this makes sense, since the amount of + space left of a note at the start of a line is very small. + + --hwn. + + */ + if (moments.length () == Moment (0, 0)) + me->suicide (); + + return SCM_UNSPECIFIED; +} + +ADD_INTERFACE (Spanner, + "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 " );