X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-determine-loose-columns.cc;h=e7e0a7f3f7014abbbec216d646d68eb2fa51df5a;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=99d9e596af48f0a6a8136c685dd0eded457292b8;hpb=6e39f536c11c8a65d3e99a43cc9dd9593c61fa4f;p=lilypond.git

diff --git a/lily/spacing-determine-loose-columns.cc b/lily/spacing-determine-loose-columns.cc
index 99d9e596af..e7e0a7f3f7 100644
--- a/lily/spacing-determine-loose-columns.cc
+++ b/lily/spacing-determine-loose-columns.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -80,8 +80,8 @@ is_loose_column (Grob *l, Grob *col, Grob *r, Spacing_options const *options)
 
   */
 
-  Item *r_neighbor = unsmob_item (col->get_object ("right-neighbor"));
-  Item *l_neighbor = unsmob_item (col->get_object ("left-neighbor"));
+  Item *r_neighbor = Item::unsmob (col->get_object ("right-neighbor"));
+  Item *l_neighbor = Item::unsmob (col->get_object ("left-neighbor"));
 
   if (!l_neighbor || !r_neighbor)
     return false;
@@ -134,10 +134,9 @@ Spacing_spanner::set_distances_for_loose_col (Grob *me, Grob *c,
                                               Drul_array<Item *> next_door,
                                               Spacing_options const *options)
 {
-  Direction d = LEFT;
   Drul_array<Real> dists (0, 0);
 
-  do
+  for (LEFT_and_RIGHT (d))
     {
       Item *lc = dynamic_cast<Item *> ((d == LEFT) ? next_door[LEFT] : c);
       Item *rc = dynamic_cast<Item *> (d == LEFT ? c : next_door[RIGHT]);
@@ -156,7 +155,7 @@ Spacing_spanner::set_distances_for_loose_col (Grob *me, Grob *c,
                 The note spacing should be taken from the musical
                 columns.
               */
-              Real base = note_spacing (me, lc, rc, options);
+              Spring base = note_spacing (me, lc, rc, options);
               Spring spring = Note_spacing::get_spacing (sp, rc, base, options->increment_);
 
               dists[d] = max (dists[d], spring.min_distance ());
@@ -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];
@@ -191,7 +189,6 @@ Spacing_spanner::prune_loose_columns (Grob *me,
                                       Spacing_options *options)
 {
   vector<Grob *> newcols;
-
   for (vsize i = 0; i < cols->size (); i++)
     {
       Grob *c = cols->at (i);
@@ -222,8 +219,8 @@ Spacing_spanner::prune_loose_columns (Grob *me,
 
       if (loose)
         {
-          Grob *right_neighbor = unsmob_grob (c->get_object ("right-neighbor"));
-          Grob *left_neighbor = unsmob_grob (c->get_object ("left-neighbor"));
+          Grob *right_neighbor = Grob::unsmob (c->get_object ("right-neighbor"));
+          Grob *left_neighbor = Grob::unsmob (c->get_object ("left-neighbor"));
 
           /*
             Either object can be non existent, if the score ends
@@ -231,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 ()));
             }
@@ -243,14 +240,14 @@ Spacing_spanner::prune_loose_columns (Grob *me,
               /*
                 Set distance constraints for loose columns
               */
-              Drul_array<Item *> next_door (dynamic_cast<Item *> (cols->at (i - 1)),
-                                            dynamic_cast<Item *> (cols->at (i + 1)));
+              Drul_array<Item *> next_door (dynamic_cast<Item *> (left_neighbor),
+                                            dynamic_cast<Item *> (right_neighbor));
 
               set_distances_for_loose_col (me, c, next_door, options);
             }
         }
 
-      if (!loose)
+      else
         newcols.push_back (c);
     }
 
@@ -285,7 +282,7 @@ Spacing_spanner::set_explicit_neighbor_columns (vector<Grob *> const &cols)
                   min_right_rank = right_rank;
                 }
 
-              Grob *old_left_neighbor = unsmob_grob (right_col->get_object ("left-neighbor"));
+              Grob *old_left_neighbor = Grob::unsmob (right_col->get_object ("left-neighbor"));
               if (!old_left_neighbor || left_rank > Paper_column::get_rank (old_left_neighbor))
                 right_col->set_object ("left-neighbor", left_col->self_scm ());
             }
@@ -307,9 +304,9 @@ Spacing_spanner::set_implicit_neighbor_columns (vector<Grob *> const &cols)
       if (!Paper_column::is_breakable (it) && !Paper_column::is_musical (it))
         continue;
 
-      if (i && !unsmob_grob (cols[i]->get_object ("left-neighbor")))
+      if (i && !Grob::is_smob (cols[i]->get_object ("left-neighbor")))
         cols[i]->set_object ("left-neighbor", cols[i - 1]->self_scm ());
-      if (i + 1 < cols.size () && !unsmob_grob (cols[i]->get_object ("right-neighbor")))
+      if (i + 1 < cols.size () && !Grob::is_smob (cols[i]->get_object ("right-neighbor")))
         cols[i]->set_object ("right-neighbor", cols[i + 1]->self_scm ());
     }
 }