Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / spacing-determine-loose-columns.cc

diff --git a/lily/spacing-determine-loose-columns.cc b/lily/spacing-determine-loose-columns.cc
index 93f70b5cecd477ebed82c058fa2d5f79c8345d12..fe5a89c80bc3f0193a42422eb14bbec43577c352 100644 (file)
--- a/lily/spacing-determine-loose-columns.cc
+++ b/lily/spacing-determine-loose-columns.cc
@@ -9,6 +9,7 @@
 
 #include "staff-spacing.hh"
 
+#include "spacing-options.hh"
 #include "system.hh"
 #include "paper-column.hh"
 #include "column-x-positions.hh"
@@ -16,6 +17,7 @@
 #include "spacing-spanner.hh"
 #include "note-spacing.hh"
 #include "moment.hh"
+#include "grob-array.hh"
 #include "break-align-interface.hh"
 #include "warn.hh"
 
@@ -30,19 +32,22 @@
   (Otherwise, we might risk core dumps, and other weird stuff.)
 */
 static bool
-is_loose_column (Grob *l, Grob *c, Grob *r, Spacing_options const *options)
+is_loose_column (Grob *l, Grob *col, Grob *r, Spacing_options const *options)
 {
+  if (!to_boolean (col->get_property ("allow-loose-spacing")))
+    return false;
+  
   if ((options->float_nonmusical_columns_
        ||options->float_grace_columns_)
-      && Paper_column::when_mom (c).grace_part_)
+      && Paper_column::when_mom (col).grace_part_)
     return true;
 
-  if (Paper_column::is_musical (c)
-      || Paper_column::is_breakable (c))
+  if (Paper_column::is_musical (col)
+      || Paper_column::is_breakable (col))
     return false;
 
-  extract_grob_set (c, "right-neighbors", rns);
-  extract_grob_set (c, "left-neighbors", lns);
+  extract_grob_set (col, "right-neighbors", rns);
+  extract_grob_set (col, "left-neighbors", lns);
 
   /*
     If this column doesn't have a proper neighbor, we should really
@@ -98,11 +103,11 @@ is_loose_column (Grob *l, Grob *c, Grob *r, Spacing_options const *options)
 
     in any case, we don't want to move bar lines.
   */
-  extract_grob_set (c, "elements", elts);
+  extract_grob_set (col, "elements", elts);
   for (vsize i = elts.size (); i--;)
     {
       Grob *g = elts[i];
-      if (g && Break_align_interface::has_interface (g))
+      if (g && Break_alignment_interface::has_interface (g))
        {
          extract_grob_set (g, "elements", gelts);
          for (vsize j = gelts.size (); j--;)
@@ -159,15 +164,13 @@ Spacing_spanner::prune_loose_columns (Grob *me, vector<Grob*> *cols,
          /*
            Set distance constraints for loose columns
          */
-         Drul_array<Grob *> next_door;
-         next_door[LEFT] = cols->at (i - 1);
-         next_door[RIGHT] = cols->at (i + 1);
+         Drul_array<Grob *> next_door (cols->at (i - 1),
+                                       cols->at (i + 1));
          Direction d = LEFT;
          Drul_array<Real> dists (0, 0);
 
          do
            {
-             dists[d] = 0.0;
              Item *lc = dynamic_cast<Item *> ((d == LEFT) ? next_door[LEFT] : c);
              Item *rc = dynamic_cast<Item *> (d == LEFT ? c : next_door[RIGHT]);
 
@@ -179,19 +182,19 @@ Spacing_spanner::prune_loose_columns (Grob *me, vector<Grob*> *cols,
                      || Note_spacing::right_column (sp) != rc)
                    continue;
 
-                 Real space, fixed;
-                 fixed = 0.0;
-                 bool dummy;
-
                  if (Note_spacing::has_interface (sp))
                    {
                      /*
                        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);
+                     Note_spacing::get_spacing (sp, rc, base, options->increment_,
+                                                &space, &fixed);
 
                      space -= options->increment_;
 
@@ -199,7 +202,8 @@ Spacing_spanner::prune_loose_columns (Grob *me, vector<Grob*> *cols,
                    }
                  else if (Staff_spacing::has_interface (sp))
                    {
-                     Real space, fixed_space;
+                     Real space = 0;
+                     Real fixed_space = 0;
                      Staff_spacing::get_spacing_params (sp,
                                                         &space, &fixed_space);