X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-spanner.cc;h=f56af93598cc577404b9690d27527a2a87922cb2;hb=545092a25d8ca41dc90b87482474b3719f7130a9;hp=18ca3bd2fa0e0f728ee95329b02828efb569698d;hpb=3130370f1e21481c80abc3e67fb33b3b505cb241;p=lilypond.git diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index 18ca3bd2fa..f56af93598 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -1,423 +1,274 @@ -/* +/* spacing-spanner.cc -- implement Spacing_spanner - + source file of the GNU LilyPond music typesetter - - (c) 1999--2002 Han-Wen Nienhuys - - */ + + (c) 1999--2005 Han-Wen Nienhuys +*/ #include -#include "line-of-score.hh" -#include "paper-score.hh" +#include +using namespace std; + +#include "spacing-spanner.hh" #include "paper-column.hh" -#include "item.hh" +#include "output-def.hh" +#include "paper-score.hh" +#include "system.hh" #include "moment.hh" #include "note-spacing.hh" -#include "misc.hh" +#include "main.hh" #include "warn.hh" +#include "pointer-group-interface.hh" +#include "spaceable-grob.hh" #include "staff-spacing.hh" +#include "spacing-interface.hh" -/* - paper-column: - - Don't be confused by right-items: each spacing wish can also contain - a number of items, with which a spacing constraint may be kept. It's - a little baroque, but it might come in handy later on? - - */ - -class Spacing_spanner +Rational +Spacing_spanner::effective_shortest_duration (Grob *me, + Link_array const &all) { -public: - static Real default_bar_spacing (Grob*,Grob*,Grob*,Moment) ; - static Real note_spacing (Grob*,Grob*,Grob*,Moment) ; - static Real get_duration_space (Grob*,Moment dur, Moment shortest) ; - - static void breakable_column_spacing (Item* l, Item *r); - static void find_loose_columns () {} - static void prune_loose_colunms (Link_array *cols); - static void find_loose_columns (Link_array cols); - static void set_explicit_neighbor_columns (Link_array cols); - static void set_implicit_neighbor_columns (Link_array cols); - static void do_measure (Grob*me,Link_array *cols); - DECLARE_SCHEME_CALLBACK (set_springs, (SCM )); -}; + 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; +} -/* - Return whether COL is fixed to its neighbors by some kind of spacing - constraint. -*/ -static bool -loose_column (Grob *l, Grob *c, Grob *r) +MAKE_SCHEME_CALLBACK (Spacing_spanner, set_springs, 1); +SCM +Spacing_spanner::set_springs (SCM smob) { - SCM rns = c->get_grob_property ("right-neighbors"); - SCM lns = c->get_grob_property ("left-neighbors"); - - /* - If this column doesn't have a proper neighbor, we should really - make it loose, but spacing it correctly is more than we can - currently can handle. - - (this happens in the following situation: - - | - | clef G - * - - | | || - | | || - O O || - - - the column containing the clef is really loose, and should be - attached right to the first column, but that is a lot of work for - such a borderline case. - - ) - - */ - if (!gh_pair_p (lns) || !gh_pair_p (rns)) - return false; - - Item * l_neighbor = dynamic_cast (unsmob_grob (gh_car (lns))); - Item * r_neighbor = dynamic_cast (unsmob_grob (gh_car (rns))); - - if (!l_neighbor || !r_neighbor) - return false; - - l_neighbor = l_neighbor->column_l(); - r_neighbor = dynamic_cast (Note_spacing::right_column (r_neighbor)); - - if (l == l_neighbor && r == r_neighbor) - return false; - - if (!l_neighbor || !r_neighbor) - return false; + Grob *me = unsmob_grob (smob); /* - Only declare loose if the bounds make a little sense. This means - some cases (two isolated, consecutive clef changes) won't be - nicely folded, but hey, then don't do that. + can't use get_system() ? --hwn. */ - if( (Paper_column::musical_b (l_neighbor) || Item::breakable_b (l_neighbor)) - && (Paper_column::musical_b (r_neighbor) || Item::breakable_b (r_neighbor))) - { - return true; - } - + Link_array all (get_root_system (me)->columns ()); - /* - If in doubt: we're not loose; the spacing engine should space for - it, risking suboptimal spacing. + set_explicit_neighbor_columns (all); - (Otherwise, we might risk core dumps, and other weird stuff.) + 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); + generate_springs (me, all, &options); - */ - return false; + return SCM_UNSPECIFIED; } /* - Remove columns that are not tightly fitting from COLS. In the - removed columns, set 'between-cols to the columns where it is in - between. + We want the shortest note that is also "common" in the piece, so we + find the shortest in each measure, and take the most frequently + found duration. + + This probably gives weird effects with modern music, where every + note has a different duration, but hey, don't write that kind of + stuff, then. */ -void -Spacing_spanner::prune_loose_colunms (Link_array *cols) +Rational +Spacing_spanner::find_shortest (Grob *me, Link_array const &cols) { - Link_array newcols; - - for (int i=0; i < cols->size (); i++) - { - if (Item::breakable_b (cols->elem(i)) || Paper_column::musical_b (cols->elem (i))) - { - newcols.push (cols->elem(i)); - continue; - } - - Grob *c = cols->elem(i); - if (loose_column (cols->elem (i-1), c, cols->elem (i+1))) - { - SCM lns = c->get_grob_property ("left-neighbors"); - lns = gh_pair_p (lns) ? gh_car (lns) : SCM_BOOL_F; + /* + ascending in duration + */ + Array durations; + Array counts; - SCM rns = c->get_grob_property ("right-neighbors"); - rns = gh_pair_p (rns) ? gh_car (rns) : SCM_BOOL_F; + Rational shortest_in_measure; + shortest_in_measure.set_infinite (1); - /* - Either object can be non existent, if the score ends - prematurely. - */ - rns = gh_car (unsmob_grob (rns)->get_grob_property ("right-items")); - c->set_grob_property ("between-cols", gh_cons (lns, - rns)); + for (int i = 0; i < cols.size (); i++) + { + if (Paper_column::is_musical (cols[i])) + { + Moment *when = unsmob_moment (cols[i]->get_property ("when")); /* - Set distance constraints for loose columns + ignore grace notes for shortest notes. */ - Drul_array next_door; - next_door[LEFT] =cols->elem (i - 1); - next_door[RIGHT] =cols->elem (i + 1); - Direction d = LEFT; - Drul_array dists(0,0); + if (when && when->grace_part_) + continue; - do + SCM st = cols[i]->get_property ("shortest-starter-duration"); + Moment this_shortest = *unsmob_moment (st); + assert (this_shortest.to_bool ()); + shortest_in_measure = min (shortest_in_measure, this_shortest.main_part_); + } + else if (!shortest_in_measure.is_infinity () + && Item::is_breakable (cols[i])) + { + int j = 0; + for (; j < durations.size (); j++) { - dists[d] = 0.0; - Grob *lc = (d == LEFT) ? next_door[LEFT] : c; - Grob *rc = d == LEFT ? c : next_door[RIGHT]; - - for (SCM s = lc->get_grob_property ("spacing-wishes"); - gh_pair_p (s); s = gh_cdr (s)) + if (durations[j] > shortest_in_measure) { - Grob *sp = unsmob_grob (gh_car (s)); - if (Note_spacing::left_column (sp) != lc - || Note_spacing::right_column (sp) != rc) - continue; - - dists[d] = dists[d] >? Note_spacing::get_spacing (sp); + counts.insert (1, j); + durations.insert (shortest_in_measure, j); + break; + } + else if (durations[j] == shortest_in_measure) + { + counts[j]++; + break; } } - while (flip (&d) != LEFT); - Rod r; - r.distance_f_ = dists[LEFT] + dists[RIGHT]; - r.item_l_drul_[LEFT] = dynamic_cast (cols->elem(i-1)); - r.item_l_drul_[RIGHT] = dynamic_cast (cols->elem (i+1)); + if (durations.size () == j) + { + durations.push (shortest_in_measure); + counts.push (1); + } - r.add_to_cols (); - } - else - { - newcols.push (c); + shortest_in_measure.set_infinite (1); } } - *cols = newcols; -} - -/* - Set neighboring columns determined by the spacing-wishes grob property. -*/ -void -Spacing_spanner::set_explicit_neighbor_columns (Link_array cols) -{ - for (int i=0; i < cols.size(); i++) + int max_idx = -1; + int max_count = 0; + for (int i = durations.size (); i--;) { - SCM right_neighbors = SCM_EOL; - int min_rank = 100000; // inf. - - - SCM wishes= cols[i]->get_grob_property ("spacing-wishes"); - for (SCM s =wishes; gh_pair_p (s); s = gh_cdr (s)) + if (counts[i] >= max_count) { - Item * wish = dynamic_cast (unsmob_grob (gh_car (s))); - - Item * lc = wish->column_l (); - Grob * right = Note_spacing::right_column (wish); - - if (!right) - continue; - - Item * rc = dynamic_cast (right); - - int right_rank = Paper_column::rank_i (rc); - int left_rank = Paper_column::rank_i (lc); - - /* - update the left column. - */ - if (right_rank <= min_rank) - { - if (right_rank < min_rank) - right_neighbors =SCM_EOL; - - min_rank = right_rank; - right_neighbors = gh_cons (wish->self_scm (), right_neighbors); - } + max_idx = i; + max_count = counts[i]; + } - /* - update the right column of the wish. - */ - int maxrank = 0; - SCM left_neighs = rc->get_grob_property ("left-neighbors"); - if (gh_pair_p (left_neighs) - && unsmob_grob (gh_car (left_neighs))) - { - Item * it = dynamic_cast (unsmob_grob (gh_car (left_neighs))); - maxrank = Paper_column::rank_i (it->column_l()); - } + // printf ("duration %d/%d, count %d\n", + // durations[i].num (), durations[i].den (), counts[i]); + } - if (left_rank >= maxrank) - { - if (left_rank > maxrank) - left_neighs = SCM_EOL; + SCM bsd = me->get_property ("base-shortest-duration"); + Rational d = Rational (1, 8); + if (Moment *m = unsmob_moment (bsd)) + d = m->main_part_; - left_neighs = gh_cons (wish->self_scm (), left_neighs); - rc->set_grob_property ("left-neighbors", right_neighbors); - } - } + if (max_idx >= 0) + d = min (d, durations[max_idx]); - if (gh_pair_p (right_neighbors)) - { - cols[i]->set_grob_property ("right-neighbors", right_neighbors); - } - } + return d; } -/* - Set neighboring columns that have no left/right-neighbor set - yet. Only do breakable non-musical columns, and musical columns. -*/ void -Spacing_spanner::set_implicit_neighbor_columns (Link_array cols) +Spacing_spanner::generate_pair_spacing (Grob *me, + Paper_column *left_col, Paper_column *right_col, + Paper_column *after_right_col, + Spacing_options const *options) { - for (int i = 0; i < cols.size (); i++) + if (Paper_column::is_musical (left_col)) { - Item * it = dynamic_cast(cols[i]); - if (!Item::breakable_b (it) && !Paper_column::musical_b (it)) - continue; + bool skip_unbroken_right = false; - // it->breakable || it->musical + 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; - /* - sloppy with typnig left/right-neighbors should take list, but paper-column found instead. - */ - SCM ln = cols[i] ->get_grob_property ("left-neighbors"); - if (!gh_pair_p (ln) && i ) + if (skip_unbroken_right) { - cols[i]->set_grob_property ("left-neighbors", gh_cons (cols[i-1]->self_scm(), SCM_EOL)); + /* + TODO: should generate rods to prevent collisions. + */ + musical_column_spacing (me, left_col, after_right_col, options); + right_col->set_object ("between-cols", scm_cons (left_col->self_scm (), + after_right_col->self_scm ())); } + else + musical_column_spacing (me, left_col, right_col, options); - SCM rn = cols[i] ->get_grob_property ("right-neighbors"); - if (!gh_pair_p (rn) && i < cols.size () - 1) - { - cols[i]->set_grob_property ("right-neighbors", gh_cons (cols[i + 1]->self_scm(), SCM_EOL)); - } + if (Item *rb = right_col->find_prebroken_piece (LEFT)) + musical_column_spacing (me, left_col, rb, options); } -} + else + { + /* + The case that the right part is broken as well is rather + rare, but it is possible, eg. with a single empty measure, + or if one staff finishes a tad earlier than the rest. + */ + Item *lb = left_col->find_prebroken_piece (RIGHT); + Item *rb = right_col->find_prebroken_piece (LEFT); + if (left_col && right_col) + breakable_column_spacing (me, left_col, right_col, options); -MAKE_SCHEME_CALLBACK (Spacing_spanner, set_springs,1); -SCM -Spacing_spanner::set_springs (SCM smob) -{ - Grob *me = unsmob_grob (smob); + if (lb && right_col) + breakable_column_spacing (me, lb, right_col, options); - Link_array all (me->pscore_l_->line_l_->column_l_arr ()) ; + if (left_col && rb) + breakable_column_spacing (me, left_col, rb, options); - set_explicit_neighbor_columns (all); - prune_loose_colunms (&all); - set_implicit_neighbor_columns (all); - - int j = 0; - for (int i = 1; i < all.size (); i++) - { - Grob *sc = all[i]; - if (Item::breakable_b (sc)) - { - Link_array measure (all.slice (j, i+1)); - do_measure (me, &measure); - j = i; - } + if (lb && rb) + breakable_column_spacing (me, lb, rb, options); } - - return SCM_UNSPECIFIED; } - void -Spacing_spanner::do_measure (Grob*me, Link_array *cols) +Spacing_spanner::generate_springs (Grob *me, + Link_array const &cols, + Spacing_options const *options) { - Moment shortest_in_measure; - - /* - space as if this duration is present. - */ - Moment base_shortest_duration = *unsmob_moment (me->get_grob_property ("maximum-duration-for-spacing")); - shortest_in_measure.set_infinite (1); - - for (int i =0 ; i < cols->size (); i++) + Paper_column *next = 0; + Paper_column *next_next = 0; + for (int i = cols.size (); i--;) { - if (Paper_column::musical_b (cols->elem (i))) - { - Moment *when = unsmob_moment (cols->elem (i)->get_grob_property ("when")); + Paper_column *col = dynamic_cast (cols[i]); + if (next) + generate_pair_spacing (me, col, next, next_next, options); - /* - ignore grace notes for shortest notes. - */ - if (when && when->grace_part_) - continue; - - SCM st = cols->elem (i)->get_grob_property ("shortest-starter-duration"); - Moment this_shortest = *unsmob_moment (st); - shortest_in_measure = shortest_in_measure springs; - - for (int i= 0; i < cols->size () - 1; i++) - { - Item * l = dynamic_cast (cols->elem (i)); - Item * r = dynamic_cast (cols->elem (i+1)); +} - Paper_column * lc = dynamic_cast (l); - Paper_column * rc = dynamic_cast (r); +/* + Generate the space between two musical columns LEFT_COL and RIGHT_COL, given + spacing parameters INCR and SHORTEST. +*/ +void +Spacing_spanner::musical_column_spacing (Grob *me, + Item *left_col, + 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); - if (!Paper_column::musical_b (l)) - { - breakable_column_spacing (l, r); + Real compound_note_space = 0.0; + Real compound_fixed_note_space = 0.0; - /* - - The case that the right part is broken as well is rather - rare, but it is possible, eg. with a single empty measure, - or if one staff finishes a tad earlier than the rest. - - */ - Item *lb = l->find_prebroken_piece (RIGHT); - Item *rb = r->find_prebroken_piece (LEFT); - - if (lb) - breakable_column_spacing (lb,r); - - if (rb) - breakable_column_spacing (l, rb); - if (lb && rb) - breakable_column_spacing (lb, rb); - - continue ; - } - - Real note_space = note_spacing (me,lc, rc, shortest_in_measure get_grob_property ("arithmetic-multiplier")); + if (options->stretch_uniformly_) + compound_note_space = base_note_space; + else + { + int wish_count = 0; - SCM seq = lc->get_grob_property ("right-neighbors"); + extract_grob_set (left_col, "right-neighbors", neighbors); /* - hinterfleisch = hind-meat = amount of space following a note. - - 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. */ - - Real stretch_distance = note_space; - - hinterfleisch = -1.0; - Real max_factor = 0.0; - for (SCM s = seq; gh_pair_p (s); s = ly_cdr (s)) + property SPACING-SEQUENCE. + */ + for (int i = 0; i < neighbors.size (); i++) { - Grob * wish = unsmob_grob (gh_car (s)); + Grob *wish = neighbors[i]; - if (Note_spacing::left_column (wish) != lc - || Note_spacing::right_column (wish) != rc) + Item *wish_rcol = Note_spacing::right_column (wish); + if (Note_spacing::left_column (wish) != left_col + || (wish_rcol != right_col && wish_rcol != right_col->original ())) continue; /* @@ -425,177 +276,184 @@ Spacing_spanner::do_measure (Grob*me, Link_array *cols) music. */ if (Note_spacing::has_interface (wish)) { - hinterfleisch = hinterfleisch >? - ( - headwid + + Real space = 0.0; + Real fixed = 0.0; - (note_space + Note_spacing::get_spacing (wish)) - *gh_scm2double (wish->get_grob_property ("space-factor")) + Note_spacing::get_spacing (wish, right_col, base_note_space, options->increment_, &space, &fixed); - + Note_spacing::stem_dir_correction (wish)); + compound_note_space = compound_note_space + space; + compound_fixed_note_space = compound_fixed_note_space + fixed; + wish_count++; } } - if (hinterfleisch < 0) + if (Paper_column::when_mom (right_col).grace_part_ + && !Paper_column::when_mom (left_col).grace_part_) + { + /* + Ugh. 0.8 is arbitrary. + */ + compound_note_space *= 0.8; + } + + if (compound_note_space < 0 || wish_count == 0) { - // maybe should issue a programming error. - hinterfleisch = note_space; + compound_note_space = base_note_space; + compound_fixed_note_space = options->increment_; } else - stretch_distance -= headwid; // why? + { + compound_note_space /= wish_count; + compound_fixed_note_space /= wish_count; + } - if (max_factor == 0.0) - max_factor = 1.0; - - Spring s; - s.distance_f_ = max_factor * hinterfleisch; - s.strength_f_ = 1 / stretch_distance; + /* + 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? + */ + compound_fixed_note_space = min (compound_fixed_note_space, + compound_note_space); + } - s.item_l_drul_[LEFT] = l; - s.item_l_drul_[RIGHT] = r; + Real inverse_strength = 1.0; + Real distance = 1.0; - s.add_to_cols(); - if (r->find_prebroken_piece (LEFT)) - { - s.item_l_drul_[RIGHT] = r->find_prebroken_piece(LEFT); - s.add_to_cols(); - } + /* + TODO: make sure that the space doesn't exceed the right margin. + */ + if (options->packed_) + { + /* + In packed mode, pack notes as tight as possible. This makes + sense mostly in combination with raggedright mode: the notes + are then printed at minimum distance. This is mostly useful + for ancient notation, but may also be useful for some flavours + of contemporary music. If not in raggedright mode, lily will + 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; } + Spaceable_grob::add_spring (left_col, right_col, distance, inverse_strength); } - /* - Read hints from L (todo: R) and generate springs. - */ + Read hints from L and generate springs. +*/ void -Spacing_spanner::breakable_column_spacing (Item* l, Item *r) +Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r, + Spacing_options const *options) { - Real max_fixed = -infinity_f; - Real max_space = -infinity_f; - - for (SCM s = l->get_grob_property ("spacing-wishes"); - gh_pair_p (s); s = gh_cdr (s)) - { - Grob * spacing_grob = unsmob_grob (gh_car (s)); - - if (!spacing_grob || !Staff_spacing::has_interface (spacing_grob)) - continue; - - Real space; - Real fixed_space; + Real compound_fixed = 0.0; + Real compound_space = 0.0; + int wish_count = 0; - Staff_spacing::get_spacing_params (spacing_grob, - &space, &fixed_space); - if (space > max_space) - { - max_space = space; - max_fixed = fixed_space; - } - } + Moment dt = Paper_column::when_mom (r) - Paper_column::when_mom (l); - if (isinf (max_space)) + if (dt == Moment (0, 0)) { - programming_error ("No pref spacing found"); - max_space = 2.0; - max_fixed = 1.0; - } - - Spring s; - s.distance_f_ = max_space; - s.strength_f_ = 1/(max_space - max_fixed); - - s.item_l_drul_[LEFT] = l; - s.item_l_drul_[RIGHT] = r; - - s.add_to_cols (); -} + extract_grob_set (l, "spacing-wishes", wishes); + for (int i = 0; i < wishes.size (); i++) + { + Item *spacing_grob = dynamic_cast (wishes[i]); -/** - Get the measure wide ant for arithmetic spacing. + if (!spacing_grob || !Staff_spacing::has_interface (spacing_grob)) + continue; - @see - John S. Gourlay. ``Spacing a Line of Music,'' Technical Report - OSU-CISRC-10/87-TR35, Department of Computer and Information Science, - The Ohio State University, 1987. + Real space; + Real fixed_space; - */ -Real -Spacing_spanner::get_duration_space (Grob*me, Moment d, Moment shortest) -{ - Real log = log_2 (shortest.main_part_); - Real k = gh_scm2double (me->get_grob_property ("arithmetic-basicspace")) - - log; + /* + column for the left one settings should be ok due automatic + pointer munging. - Rational compdur = d.main_part_ + d.grace_part_ /Rational (3); - - return (log_2 (compdur) + k) * gh_scm2double (me->get_grob_property ("arithmetic-multiplier")); -} + */ + assert (spacing_grob->get_column () == l); + Staff_spacing::get_spacing_params (spacing_grob, + &space, &fixed_space); -Real -Spacing_spanner::note_spacing (Grob*me, Grob *lc, Grob *rc, - Moment shortest) -{ - Moment shortest_playing_len = 0; - SCM s = lc->get_grob_property ("shortest-playing-duration"); + if (Paper_column::when_mom (r).grace_part_) + { + /* + Correct for grace notes. + Ugh. The 0.8 is arbitrary. + */ + space *= 0.8; + } - if (unsmob_moment (s)) - shortest_playing_len = *unsmob_moment (s); - - if (! shortest_playing_len.to_bool ()) - { - programming_error ("can't find a ruling note at " + Paper_column::when_mom (lc).str ()); - shortest_playing_len = 1; - } - - if (! shortest.to_bool ()) - { - programming_error ("no minimum in measure at " + Paper_column::when_mom (lc).str ()); - shortest = 1; + compound_space += space; + compound_fixed += fixed_space; + wish_count++; + } } - Moment delta_t = Paper_column::when_mom (rc) - Paper_column::when_mom (lc); - Real dist = 0.0; - if (delta_t.main_part_) + if (compound_space <= 0.0 || !wish_count) { - dist = get_duration_space (me, shortest_playing_len, shortest); - dist *= (double) (delta_t.main_part_ / shortest_playing_len.main_part_); + standard_breakable_column_spacing (me, l, r, &compound_fixed, &compound_space, + options); + wish_count = 1; } - else if (delta_t.grace_part_) + else { - dist = get_duration_space (me, shortest, shortest); - - Real grace_fact = 1.0; - SCM gf = me->get_grob_property ("grace-space-factor"); - if (gh_number_p (gf)) - grace_fact = gh_scm2double (gf); - - dist *= grace_fact; + compound_space /= wish_count; + compound_fixed /= wish_count; } -#if 0 - /* - TODO: figure out how to space grace notes. - */ + if (options->stretch_uniformly_ && l->break_status_dir () != RIGHT) + compound_fixed = 0.0; - dist *= - + grace_fact * (double) (delta_t.grace_part_ / shortest_playing_len.main_part_); + assert (!isinf (compound_space)); + compound_space = max (compound_space, compound_fixed); + /* + There used to be code that changed spacing depending on + raggedright setting. Ugh. - Moment *lm = unsmob_moment (lc->get_grob_property ("when")); - Moment *rm = unsmob_moment (rc->get_grob_property ("when")); + Do it more cleanly, or rename the property. - if (lm && rm) - { - if (lm->grace_part_ && rm->grace_part_) - dist *= 0.5; - else if (!rm->grace_part_ && lm->grace_part_) - dist *= 0.7; - } -#endif - - return dist; + */ + Real inverse_strength = (compound_space - compound_fixed); + Real distance = compound_space; + Spaceable_grob::add_spring (l, r, distance, inverse_strength); } +ADD_INTERFACE (Spacing_spanner, "spacing-spanner-interface", + "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" + "spaced proportonial to their duration.\n" + "\n" + "Typically, the increment is the width of a black note head. In a\n" + "piece with lots of 8th notes, and some 16th notes, the eighth note\n" + "gets 2 note heads width (i.e. the space following a note is 1 note\n" + "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", + + "grace-space-factor " + "spacing-increment " + "base-shortest-duration " + "strict-note-spacing " + "shortest-duration-space " + "common-shortest-duration " + "uniform-stretching " + "packed-spacing " + ); + +ADD_INTERFACE (Spacing_interface, "spacing-interface", + "Something to do with line breaking and spacing. " + "Kill this one after determining line breaks.", + ""); +