X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-determine-loose-columns.cc;h=2deae13b27dbf59568f8263e07c7c69e0e5748ba;hb=64e41db323e125dd6365e69d27c0d50112a744f9;hp=4fe7885259a336b259e18061252a7cc83b9d7007;hpb=d61cf3bbdb1c6670a127ba3baddf2f04d3e34fd3;p=lilypond.git diff --git a/lily/spacing-determine-loose-columns.cc b/lily/spacing-determine-loose-columns.cc index 4fe7885259..2deae13b27 100644 --- a/lily/spacing-determine-loose-columns.cc +++ b/lily/spacing-determine-loose-columns.cc @@ -134,10 +134,9 @@ Spacing_spanner::set_distances_for_loose_col (Grob *me, Grob *c, Drul_array next_door, Spacing_options const *options) { - Direction d = LEFT; Drul_array dists (0, 0); - do + for (LEFT_and_RIGHT (d)) { Item *lc = dynamic_cast ((d == LEFT) ? next_door[LEFT] : c); Item *rc = dynamic_cast (d == LEFT ? c : next_door[RIGHT]); @@ -171,7 +170,6 @@ Spacing_spanner::set_distances_for_loose_col (Grob *me, Grob *c, programming_error ("Subversive spacing wish"); } } - while (flip (&d) != LEFT); Rod r; r.distance_ = dists[LEFT] + dists[RIGHT]; @@ -230,7 +228,7 @@ Spacing_spanner::prune_loose_columns (Grob *me, */ if (!right_neighbor || !left_neighbor) { - c->programming_error ("Cannot determine neighbors for floating column. "); + c->programming_error ("Cannot determine neighbors for floating column."); c->set_object ("between-cols", scm_cons (cols->at (i - 1)->self_scm (), cols->at (i + 1)->self_scm ())); }