X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Fspacing-spanner.cc;h=b21ce3d3ab7feac013832be6d105b7758ee98550;hb=97759ace2c13860488de4e9498607adac8d20963;hp=2ac4caf13e18339fff0d3b27f4559e0ce7a3140f;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index 2ac4caf13e..b21ce3d3ab 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -26,48 +26,34 @@ using namespace std; #include "system.hh" #include "warn.hh" - -/* - TODO: - - use callback instead? - -*/ -Rational -Spacing_spanner::effective_shortest_duration (Grob *me, - Link_array const &all) +vector +Spacing_spanner::get_columns (Spanner *me) { - SCM preset_shortest = me->get_property ("common-shortest-duration"); - Rational global_shortest; - if (unsmob_moment (preset_shortest)) - global_shortest = unsmob_moment (preset_shortest)->main_part_; - else - { - global_shortest = Spacing_spanner::find_shortest (me, all); - if (be_verbose_global) - message (_f ("Global shortest duration is %s", global_shortest.to_string ()) + "\n"); - } - - return global_shortest; + vector all (get_root_system (me)->columns ()); + vsize start = binary_search (all, (Grob*)me->get_bound (LEFT), + &Paper_column::compare); + vsize end = binary_search (all, (Grob*) me->get_bound (RIGHT), + &Paper_column::compare); + + all = vector::vector (all.begin () + start, + all.begin () + end + 1); + return all; } - MAKE_SCHEME_CALLBACK (Spacing_spanner, set_springs, 1); SCM Spacing_spanner::set_springs (SCM smob) { - Grob *me = unsmob_grob (smob); + Spanner *me = unsmob_spanner (smob); /* can't use get_system() ? --hwn. */ - Link_array all (get_root_system (me)->columns ()); - + vector all (get_columns (me)); set_explicit_neighbor_columns (all); Spacing_options options; options.init_from_grob (me); - options.global_shortest_ = effective_shortest_duration (me, all); prune_loose_columns (me, &all, &options); set_implicit_neighbor_columns (all); @@ -85,14 +71,20 @@ Spacing_spanner::set_springs (SCM smob) note has a different duration, but hey, don't write that kind of stuff, then. */ -Rational -Spacing_spanner::find_shortest (Grob *me, Link_array const &cols) + +MAKE_SCHEME_CALLBACK (Spacing_spanner, calc_common_shortest_duration, 1); +SCM +Spacing_spanner::calc_common_shortest_duration (SCM grob) { + Spanner *me = unsmob_spanner (grob); + + vector cols (get_columns (me)); + /* ascending in duration */ - std::vector durations; - std::vector counts; + vector durations; + vector counts; Rational shortest_in_measure; shortest_in_measure.set_infinite (1); @@ -115,15 +107,15 @@ Spacing_spanner::find_shortest (Grob *me, Link_array const &cols) shortest_in_measure = min (shortest_in_measure, this_shortest.main_part_); } else if (!shortest_in_measure.is_infinity () - && Item::is_breakable (cols[i])) + && Paper_column::is_breakable (cols[i])) { vsize j = 0; for (; j < durations.size (); j++) { if (durations[j] > shortest_in_measure) { - counts.insert (1, j); - durations.insert (shortest_in_measure, j); + counts.insert (counts.begin () + j, 1); + durations.insert (durations.begin () + j, shortest_in_measure); break; } else if (durations[j] == shortest_in_measure) @@ -165,7 +157,7 @@ Spacing_spanner::find_shortest (Grob *me, Link_array const &cols) if (max_idx >= 0) d = min (d, durations[max_idx]); - return d; + return Moment (d).smobbed_copy (); } void @@ -225,19 +217,19 @@ Spacing_spanner::generate_pair_spacing (Grob *me, void Spacing_spanner::generate_springs (Grob *me, - Link_array const &cols, + vector const &cols, Spacing_options const *options) { - Paper_column *next = 0; - Paper_column *next_next = 0; - for (vsize i = cols.size (); i--;) + Paper_column *prev = 0; + for (vsize i = 0; i < cols.size (); i++) { Paper_column *col = dynamic_cast (cols[i]); - if (next) - generate_pair_spacing (me, col, next, next_next, options); + Paper_column *next = (i < cols.size()-1) ? dynamic_cast (cols[i+1]) : 0; + + if (i > 0) + generate_pair_spacing (me, prev, col, next, options); - next_next = next; - next = col; + prev = col; } } @@ -260,7 +252,19 @@ Spacing_spanner::musical_column_spacing (Grob *me, Real compound_fixed_note_space = 0.0; if (options->stretch_uniformly_) - compound_note_space = base_note_space; + { + compound_note_space = base_note_space; + + if (!Paper_column::is_musical (right_col)) + { + /* + Crude fix for notes that lead up to barlines and time sigs. + */ + Interval lext = right_col->extent (right_col, X_AXIS); + if (!lext.is_empty ()) + compound_note_space += -lext[LEFT]; + } + } else { int wish_count = 0; @@ -312,8 +316,21 @@ Spacing_spanner::musical_column_spacing (Grob *me, if (compound_note_space < 0 || wish_count == 0) { + /* + Fixed should be 0.0. If there are no spacing wishes, we're + likely dealing with polyphonic spacing of hemiolas. + + We used to have compound_fixed_note_space = options->increment_ + + but this can lead to numeric instability problems when we + do + + inverse_strength = (compound_note_space - compound_fixed_note_space) + + */ + compound_note_space = base_note_space; - compound_fixed_note_space = options->increment_; + compound_fixed_note_space = 0.0; } else if (to_boolean (me->get_property ("average-spacing-wishes"))) { @@ -476,19 +493,22 @@ ADD_INTERFACE (Spacing_spanner, "spacing-spanner-interface", "head width) A 16th note is followed by 0.5 note head width. The\n" "quarter note is followed by 3 NHW, the half by 4 NHW, etc.\n", + "average-spacing-wishes " - "grace-space-factor " - "spacing-increment " "base-shortest-duration " - "strict-note-spacing " - "shortest-duration-space " "common-shortest-duration " - "uniform-stretching " "packed-spacing " + "shortest-duration-space " + "spacing-increment " + "strict-grace-spacing " + "strict-note-spacing " + "uniform-stretching " + ); ADD_INTERFACE (Spacing_interface, "spacing-interface", "Something to do with line breaking and spacing. " "Kill this one after determining line breaks.", + "");