X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=af2ea7137f0d9ab4dbddc9127d6dfc03f549e180;hb=522f419e3ed3e09ecf834bbb5315ac1777ab13e0;hp=9a8ff83a3ffca20c2579e67ec9770b716c5779bc;hpb=1152d91a1c8ac90528660df7dfa6be2181f89c05;p=lilypond.git diff --git a/lily/spanner.cc b/lily/spanner.cc index 9a8ff83a3f..af2ea7137f 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -101,7 +101,7 @@ Spanner::do_break_processing () if (!bounds[LEFT] || ! bounds[RIGHT]) { - programming_error ("bounds of this piece aren't breakable. "); + programming_error ("bounds of this piece aren't breakable."); continue; } @@ -110,7 +110,8 @@ Spanner::do_break_processing () if (!ok) { - programming_error (to_string ("Spanner `%s' is not fully contained in parent spanner. Ignoring orphaned part", + programming_error (to_string ("Spanner `%s' is not fully contained in parent spanner." + " Ignoring orphaned part", name ().c_str ())); continue; } @@ -319,32 +320,6 @@ Spanner::is_broken () const 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 - clef and key on the staves. This is necessary for ties, slurs, - crescendo and decrescendo signs, for example. -*/ -Real -Spanner::get_broken_left_end_align () const -{ - 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) - { - /* - 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 (sc, X_AXIS)[RIGHT]; - } - - return 0.0; -} - void Spanner::derived_mark () const { @@ -353,7 +328,7 @@ Spanner::derived_mark () const for (LEFT_and_RIGHT (d)) if (spanned_drul_[d]) scm_gc_mark (spanned_drul_[d]->self_scm ()); - ; + ; for (vsize i = broken_intos_.size (); i--;) scm_gc_mark (broken_intos_[i]->self_scm ());