X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=66b35dcd1b8b53df0438bcccddc62b96be71b134;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=9a8ff83a3ffca20c2579e67ec9770b716c5779bc;hpb=233fb6a8b3b6e31de1841641dbbd4c4f43423151;p=lilypond.git diff --git a/lily/spanner.cc b/lily/spanner.cc index 9a8ff83a3f..66b35dcd1b 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1996--2012 Han-Wen Nienhuys + Copyright (C) 1996--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -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; } @@ -182,6 +183,10 @@ Spanner::get_bound (Direction d) const /* Set the items that this spanner spans. If D == LEFT, we also set the X-axis parent of THIS to S. + + For example, when a slur crosses a line break, it's broken into two + pieces. The second piece shouldn't be positioned relative to the + original NoteColumn, but rather to the PaperColumn after the break. */ void Spanner::set_bound (Direction d, Grob *s) @@ -199,7 +204,14 @@ 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); + /* + If the X-parent is a spanner, it will be split across linebreaks, too, + so we shouldn't have to overwrite it with the bound. Also, we need + original parent for alignment. + This happens e.g. for MultiMeasureRestNumbers and PercentRepeatCounters. + */ + if (!dynamic_cast (this->get_parent (X_AXIS))) + set_parent (i, X_AXIS); /* Signal that this column needs to be kept alive. They need to be @@ -319,32 +331,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 +339,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 ()); @@ -378,7 +364,7 @@ MAKE_SCHEME_CALLBACK (Spanner, set_spacing_rods, 1); SCM Spanner::set_spacing_rods (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = Grob::unsmob (smob); SCM num_length = me->get_property ("minimum-length"); if (scm_is_number (num_length)) { @@ -410,6 +396,23 @@ Spanner::set_spacing_rods (SCM smob) r.item_drul_[LEFT] = sp->get_bound (LEFT); r.item_drul_[RIGHT] = sp->get_bound (RIGHT); r.add_to_cols (); + + /* + We do not know yet if the spanner is going to have a bound that is + broken. To account for this uncertainty, we add the rod twice: + once for the central column (see above) and once for the left column + (see below). As end_rods_ are never used when rods_ are used and vice + versa, this rod will only be accessed once for each spacing + configuraiton before line breaking. Then, as a grob never exists in + both unbroken and broken forms after line breaking, only one of these + two rods will be in the column vector used for spacing in + simple-spacer.cc get_line_confugration. + */ + if (Item *left_pbp = sp->get_bound (RIGHT)->find_prebroken_piece (LEFT)) + { + r.item_drul_[RIGHT] = left_pbp; + r.add_to_cols (); + } } return SCM_UNSPECIFIED; @@ -419,7 +422,7 @@ MAKE_SCHEME_CALLBACK (Spanner, calc_normalized_endpoints, 1); SCM Spanner::calc_normalized_endpoints (SCM smob) { - Spanner *me = unsmob_spanner (smob); + Spanner *me = Spanner::unsmob (smob); SCM result = SCM_EOL; Spanner *orig = dynamic_cast (me->original ()); @@ -462,17 +465,11 @@ Spanner::calc_normalized_endpoints (SCM smob) return result; } -Spanner * -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); + Spanner *me = Spanner::unsmob (grob); Grob *common = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT), X_AXIS); @@ -488,7 +485,7 @@ MAKE_SCHEME_CALLBACK (Spanner, kill_zero_spanned_time, 1); SCM Spanner::kill_zero_spanned_time (SCM grob) { - Spanner *me = unsmob_spanner (grob); + Spanner *me = Spanner::unsmob (grob); /* Remove the line or hairpin at the start of the line. For piano voice indicators, it makes no sense to have them at