X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-determine-loose-columns.cc;h=ed706a6575460447c16d6eb2d2866d28dda3d3c2;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=8f6355b26e024aea3f2e2991662a2435b1b1dc78;hpb=af770f3440264c18ce01525dce1aa76b86ace0d5;p=lilypond.git diff --git a/lily/spacing-determine-loose-columns.cc b/lily/spacing-determine-loose-columns.cc index 8f6355b26e..ed706a6575 100644 --- a/lily/spacing-determine-loose-columns.cc +++ b/lily/spacing-determine-loose-columns.cc @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 2005--2006 Han-Wen Nienhuys + (c) 2005--2008 Han-Wen Nienhuys */ #include "staff-spacing.hh" @@ -14,6 +14,7 @@ #include "paper-column.hh" #include "column-x-positions.hh" #include "pointer-group-interface.hh" +#include "spacing-interface.hh" #include "spacing-spanner.hh" #include "note-spacing.hh" #include "moment.hh" @@ -39,7 +40,7 @@ is_loose_column (Grob *l, Grob *col, Grob *r, Spacing_options const *options) if ((options->float_nonmusical_columns_ - ||options->float_grace_columns_) + || options->float_grace_columns_) && Paper_column::when_mom (col).grace_part_) { return true; @@ -86,7 +87,7 @@ is_loose_column (Grob *l, Grob *col, Grob *r, Spacing_options const *options) return false; l_neighbor = l_neighbor->get_column (); - r_neighbor = dynamic_cast (Note_spacing::right_column (r_neighbor)); + r_neighbor = dynamic_cast (Spacing_interface::right_column (r_neighbor)); if (l == l_neighbor && r == r_neighbor) return false; @@ -104,9 +105,6 @@ is_loose_column (Grob *l, Grob *col, Grob *r, Spacing_options const *options) return false; /* - A rather hairy check, but we really only want to move around - clefs. (anything else?) - in any case, we don't want to move bar lines. */ extract_grob_set (col, "elements", elts); @@ -120,9 +118,6 @@ is_loose_column (Grob *l, Grob *col, Grob *r, Spacing_options const *options) { Grob *h = gelts[j]; - /* - ugh. -- fix staff-bar name? - */ if (h && h->get_property ("break-align-symbol") == ly_symbol2scm ("staff-bar")) return false; } @@ -149,8 +144,8 @@ Spacing_spanner::set_distances_for_loose_col (Grob *me, Grob *c, for (vsize k = wishes.size (); k--;) { Grob *sp = wishes[k]; - if (Note_spacing::left_column (sp) != lc - || Note_spacing::right_column (sp) != rc) + if (Spacing_interface::left_column (sp) != lc + || Spacing_interface::right_column (sp) != rc) continue; if (Note_spacing::has_interface (sp)) @@ -159,26 +154,16 @@ Spacing_spanner::set_distances_for_loose_col (Grob *me, Grob *c, The note spacing should be taken from the musical columns. */ - Real space = 0.0; - Real fixed = 0.0; - bool dummy = false; - - Real base = note_spacing (me, lc, rc, options, &dummy); - Note_spacing::get_spacing (sp, rc, base, options->increment_, - &space, &fixed); - - space -= options->increment_; + Real base = note_spacing (me, lc, rc, options); + Spring spring = Note_spacing::get_spacing (sp, rc, base, options->increment_); - dists[d] = max (dists[d], space); + dists[d] = max (dists[d], spring.min_distance ()); } else if (Staff_spacing::has_interface (sp)) { - Real space = 0; - Real fixed_space = 0; - Staff_spacing::get_spacing_params (sp, - &space, &fixed_space); + Spring spring = Staff_spacing::get_spacing (sp, rc); - dists[d] = max (dists[d], fixed_space); + dists[d] = max (dists[d], spring.min_distance ()); } else programming_error ("Subversive spacing wish"); @@ -200,8 +185,9 @@ Spacing_spanner::set_distances_for_loose_col (Grob *me, Grob *c, between. */ void -Spacing_spanner::prune_loose_columns (Grob *me, vector *cols, - Spacing_options const *options) +Spacing_spanner::prune_loose_columns (Grob *me, + vector *cols, + Spacing_options *options) { vector newcols; @@ -209,7 +195,7 @@ Spacing_spanner::prune_loose_columns (Grob *me, vector *cols, { Grob *c = cols->at (i); - bool loose = (i > 0 && i < cols->size () - 1) + bool loose = (i > 0 && i + 1 < cols->size ()) && is_loose_column (cols->at (i - 1), c, cols->at (i + 1), options); if (loose) @@ -234,8 +220,20 @@ Spacing_spanner::prune_loose_columns (Grob *me, vector *cols, } else { + Grob *min_item = 0; + int min_rank = INT_MAX; + for (vsize j = 0; j < right_items.size (); j ++) + { + int rank = dynamic_cast (right_items[j])->get_column ()->get_rank (); + if (rank < min_rank) + { + min_item = right_items[j]; + min_rank = rank; + } + } + c->set_object ("between-cols", scm_cons (lns, - right_items[0]->self_scm ())); + min_item->self_scm ())); /* Set distance constraints for loose columns @@ -264,7 +262,7 @@ Spacing_spanner::set_explicit_neighbor_columns (vector const &cols) { SCM right_neighbors = Grob_array::make_array (); Grob_array *rn_arr = unsmob_grob_array (right_neighbors); - int min_rank = 100000; // inf. + int min_rank = INT_MAX; extract_grob_set (cols[i], "spacing-wishes", wishes); for (vsize k = wishes.size (); k--;) @@ -272,7 +270,7 @@ Spacing_spanner::set_explicit_neighbor_columns (vector const &cols) Item *wish = dynamic_cast (wishes[k]); Item *lc = wish->get_column (); - Grob *right = Note_spacing::right_column (wish); + Grob *right = Spacing_interface::right_column (wish); if (!right) continue; @@ -338,8 +336,6 @@ Spacing_spanner::set_implicit_neighbor_columns (vector const &cols) if (!Paper_column::is_breakable (it) && !Paper_column::is_musical (it)) continue; - // it->breakable || it->musical - /* sloppy with typing left/right-neighbors should take list, but paper-column found instead. */ @@ -352,7 +348,7 @@ Spacing_spanner::set_implicit_neighbor_columns (vector const &cols) cols[i]->set_object ("left-neighbors", ga_scm); } extract_grob_set (cols[i], "right-neighbors", rns); - if (rns.empty () && i < cols.size () - 1) + if (rns.empty () && i + 1 < cols.size ()) { SCM ga_scm = Grob_array::make_array (); Grob_array *ga = unsmob_grob_array (ga_scm);