X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-spanner.cc;h=5394677d7c8c6e89c899ea4538be8f93c2323d20;hb=296ea0d2781a88aa27fdcda2f0ea0aeae257f060;hp=3e7aa266bd7c5cd214f8e3ba5f10adfeaa9c8e2e;hpb=646dc885be3ecf5473a5a0a0fe03f71428a43056;p=lilypond.git diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index 3e7aa266bd..5394677d7c 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -3,15 +3,17 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2006 Han-Wen Nienhuys + (c) 1999--2007 Han-Wen Nienhuys */ #include "spacing-spanner.hh" #include #include + using namespace std; +#include "spacing-options.hh" #include "international.hh" #include "main.hh" #include "moment.hh" @@ -27,14 +29,15 @@ using namespace std; #include "warn.hh" vector -Spacing_spanner::get_columns (Spanner *me) +Spacing_spanner::get_columns (Grob *me_grob) { - vector all (get_root_system (me)->columns ()); + Spanner *me = dynamic_cast (me_grob); + vector all (get_root_system (me)->used_columns ()); vsize start = binary_search (all, (Grob*)me->get_bound (LEFT), &Paper_column::less_than); vsize end = binary_search (all, (Grob*) me->get_bound (RIGHT), - &Paper_column::less_than); - + &Paper_column::less_than); + all = vector::vector (all.begin () + start, all.begin () + end + 1); return all; @@ -47,17 +50,16 @@ Spacing_spanner::set_springs (SCM smob) Spanner *me = unsmob_spanner (smob); /* - can't use get_system() ? --hwn. + can't use get_system () ? --hwn. */ - vector all (get_columns (me)); - set_explicit_neighbor_columns (all); - Spacing_options options; options.init_from_grob (me); + vector cols = Spacing_spanner::get_columns (me); + set_explicit_neighbor_columns (cols); - prune_loose_columns (me, &all, &options); - set_implicit_neighbor_columns (all); - generate_springs (me, all, &options); + prune_loose_columns (me, &cols, &options); + set_implicit_neighbor_columns (cols); + generate_springs (me, cols, &options); return SCM_UNSPECIFIED; } @@ -144,9 +146,6 @@ Spacing_spanner::calc_common_shortest_duration (SCM grob) max_idx = i; max_count = counts[i]; } - - // printf ("duration %d/%d, count %d\n", - // durations[i].num (), durations[i].den (), counts[i]); } SCM bsd = me->get_property ("base-shortest-duration"); @@ -168,15 +167,10 @@ Spacing_spanner::generate_pair_spacing (Grob *me, { if (Paper_column::is_musical (left_col)) { - bool skip_unbroken_right = false; - if (!Paper_column::is_musical (right_col) && options->float_nonmusical_columns_ && after_right_col && Paper_column::is_musical (after_right_col)) - skip_unbroken_right = true; - - if (skip_unbroken_right) { /* TODO: should generate rods to prevent collisions. @@ -224,7 +218,7 @@ Spacing_spanner::generate_springs (Grob *me, for (vsize i = 0; i < cols.size (); i++) { Paper_column *col = dynamic_cast (cols[i]); - Paper_column *next = (i < cols.size()-1) ? dynamic_cast (cols[i+1]) : 0; + Paper_column *next = (i + 1 < cols.size ()) ? dynamic_cast (cols[i+1]) : 0; if (i > 0) generate_pair_spacing (me, prev, col, next, options); @@ -234,8 +228,7 @@ Spacing_spanner::generate_springs (Grob *me, } /* - Generate the space between two musical columns LEFT_COL and RIGHT_COL, given - spacing parameters INCR and SHORTEST. + Generate the space between two musical columns LEFT_COL and RIGHT_COL. */ void Spacing_spanner::musical_column_spacing (Grob *me, @@ -243,45 +236,22 @@ Spacing_spanner::musical_column_spacing (Grob *me, Item *right_col, Spacing_options const *options) { - bool expand_only = false; - Real base_note_space = note_spacing (me, left_col, right_col, options, &expand_only); - - Real max_fixed = 0; - Real max_space = 0; - Real compound_note_space = 0.0; - Real compound_fixed_note_space = 0.0; + Real base_note_space = note_spacing (me, left_col, right_col, options); + Spring spring; if (options->stretch_uniformly_) - { - 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]; - } - } + spring = Spring (base_note_space, 0.0); else { - int wish_count = 0; - + vector springs; extract_grob_set (left_col, "right-neighbors", neighbors); - /* - We adjust the space following a note only if the next note - happens after the current note (this is set in the grob - property SPACING-SEQUENCE. - */ for (vsize i = 0; i < neighbors.size (); i++) { Grob *wish = neighbors[i]; - Item *wish_rcol = Note_spacing::right_column (wish); - if (Note_spacing::left_column (wish) != left_col + Item *wish_rcol = Spacing_interface::right_column (wish); + if (Spacing_interface::left_column (wish) != left_col || (wish_rcol != right_col && wish_rcol != right_col->original ())) continue; @@ -289,74 +259,53 @@ Spacing_spanner::musical_column_spacing (Grob *me, This is probably a waste of time in the case of polyphonic music. */ if (Note_spacing::has_interface (wish)) - { - Real space = 0.0; - Real fixed = 0.0; - - Note_spacing::get_spacing (wish, right_col, base_note_space, options->increment_, &space, &fixed); - - - max_space = max (max_space, space); - max_fixed = max (max_fixed, fixed); - - compound_note_space += space; - compound_fixed_note_space += fixed; - wish_count++; - } + springs.push_back (Note_spacing::get_spacing (wish, right_col, base_note_space, options->increment_)); } - if (Paper_column::when_mom (right_col).grace_part_ - && !Paper_column::when_mom (left_col).grace_part_) + if (springs.empty ()) { - /* - Ugh. 0.8 is arbitrary. - */ - compound_note_space *= 0.8; - } - 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. + if (!Paper_column::is_musical (right_col)) + { + /* + There used to be code that examined left_col->extent + (X_AXIS), but this is resulted in unexpected wide + spacing, because the width of s^"text" output is also + taken into account here. + */ + spring = Spring (max (base_note_space, options->increment_), + options->increment_); + } + else + { + /* + 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_ + We used to have min_distance_ = options->increment_ - but this can lead to numeric instability problems when we - do + but this can lead to numeric instability problems when we + do - inverse_strength = (compound_note_space - compound_fixed_note_space) + inverse_strength = (distance_ - min_distance_) - */ - - compound_note_space = base_note_space; - compound_fixed_note_space = 0.0; - } - else if (to_boolean (me->get_property ("average-spacing-wishes"))) - { - compound_note_space /= wish_count; - compound_fixed_note_space /= wish_count; + */ + spring = Spring (base_note_space, 0.0); + } } else - { - compound_fixed_note_space = max_fixed; - compound_note_space = max_space; - } + spring = merge_springs (springs); + } + if (Paper_column::when_mom (right_col).grace_part_ + && !Paper_column::when_mom (left_col).grace_part_) + { /* - Whatever we do, the fixed space is smaller than the real - space. - - TODO: this criterion is discontinuous in the derivative. - Maybe it should be continuous? + Ugh. 0.8 is arbitrary. */ - compound_fixed_note_space = min (compound_fixed_note_space, - compound_note_space); + spring *= 0.8; } - Real inverse_strength = 1.0; - Real distance = 1.0; - /* TODO: make sure that the space doesn't exceed the right margin. */ @@ -371,16 +320,47 @@ Spacing_spanner::musical_column_spacing (Grob *me, pack as much bars of music as possible into a line, but the line will then be stretched to fill the whole linewidth. */ - inverse_strength = 1.0; - distance = compound_fixed_note_space; - } - else - { - inverse_strength = (compound_note_space - compound_fixed_note_space); - distance = compound_note_space; + spring.set_distance (spring.min_distance ()); + spring.set_inverse_stretch_strength (1.0); } - Spaceable_grob::add_spring (left_col, right_col, distance, inverse_strength); + Spaceable_grob::add_spring (left_col, right_col, spring); +} + +/* + Check if COL fills the whole measure. + */ +bool +Spacing_spanner::fills_measure (Grob *me, Item *left, Item *col) +{ + System *sys = get_root_system (me); + Item *next = sys->column (col->get_column ()->get_rank () + 1); + if (!next) + return false; + + if (Paper_column::is_musical (next) + || Paper_column::is_musical (left) + || !Paper_column::is_musical (col) + || !Paper_column::is_used (next)) + return false; + + Moment dt = + Paper_column::when_mom (next) - Paper_column::when_mom (col); + + Moment *len = unsmob_moment (left->get_property ("measure-length")); + if (!len) + return false; + + /* + Don't check for exact measure length, since ending measures are + often shortened due to pickups. + */ + if (dt.main_part_ > len->main_part_ / Rational (2) + && (next->is_broken () + || next->break_status_dir ())) + return true; + + return false; } /* @@ -390,12 +370,8 @@ void Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r, Spacing_options const *options) { - Real compound_fixed = 0.0; - Real compound_space = 0.0; - Real max_fixed = 0.0; - Real max_space = 0.0; - - int wish_count = 0; + vector springs; + Spring spring; Moment dt = Paper_column::when_mom (r) - Paper_column::when_mom (l); @@ -410,78 +386,49 @@ Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r, if (!spacing_grob || !Staff_spacing::has_interface (spacing_grob)) continue; - Real space; - Real fixed_space; - /* column for the left one settings should be ok due automatic pointer munging. - */ assert (spacing_grob->get_column () == l); - Staff_spacing::get_spacing_params (spacing_grob, - &space, &fixed_space); - - if (Paper_column::when_mom (r).grace_part_) - { - /* - Correct for grace notes. - - Ugh. The 0.8 is arbitrary. - */ - space *= 0.8; - } - - max_space = max (max_space, space); - max_fixed = max (max_fixed, fixed_space); - - compound_space += space; - compound_fixed += fixed_space; - wish_count++; + springs.push_back (Staff_spacing::get_spacing (spacing_grob)); } } - if (compound_space <= 0.0 || !wish_count) - { - standard_breakable_column_spacing (me, l, r, &compound_fixed, &compound_space, - options); - wish_count = 1; - } + if (springs.empty ()) + spring = standard_breakable_column_spacing (me, l, r, options); else + spring = merge_springs (springs); + + if (Paper_column::when_mom (r).grace_part_) { - if (to_boolean (me->get_property ("average-spacing-wishes"))) - { - compound_space /= wish_count; - compound_fixed /= wish_count; - } - else - { - compound_fixed = max_fixed; - compound_space = max_space; - } - + /* + Correct for grace notes. + + Ugh. The 0.8 is arbitrary. + */ + spring *= 0.8; } + if (Paper_column::is_musical (r) + && l->break_status_dir () == CENTER + && fills_measure (me, l, r)) + { + spring.set_distance (spring.distance () + 1.0); + spring.set_default_strength (); + } + if (options->stretch_uniformly_ && l->break_status_dir () != RIGHT) - compound_fixed = 0.0; - - assert (!isinf (compound_space)); - compound_space = max (compound_space, compound_fixed); - - /* - There used to be code that changed spacing depending on - raggedright setting. Ugh. - - Do it more cleanly, or rename the property. + { + spring.set_min_distance (0.0); + spring.set_default_strength (); + } - */ - Real inverse_strength = (compound_space - compound_fixed); - Real distance = compound_space; - Spaceable_grob::add_spring (l, r, distance, inverse_strength); + Spaceable_grob::add_spring (l, r, spring); } -ADD_INTERFACE (Spacing_spanner, "spacing-spanner-interface", +ADD_INTERFACE (Spacing_spanner, "The space taken by a note is dependent on its duration. Doubling a\n" "duration adds spacing-increment to the space. The most common shortest\n" "note gets @code{shortest-duration-space}. Notes that are even shorter are\n" @@ -506,9 +453,3 @@ ADD_INTERFACE (Spacing_spanner, "spacing-spanner-interface", ); -ADD_INTERFACE (Spacing_interface, "spacing-interface", - "Something to do with line breaking and spacing. " - "Kill this one after determining line breaks.", - - ""); -