*** empty log message ***

[lilypond.git] / lily / simple-spacer.cc

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index e9afca6cbd5af575e5f24a219238e92f3f5ff368..c7d016b27c2dfb894e75cb752b9f73a973977723 100644 (file)
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -74,7 +74,7 @@ Simple_spacer::add_rod (int l, int r, Real dist)
 {
   if (isinf (dist) || isnan (dist))
     {
-      programming_error ("Weird minimum distance. Ignoring");
+      programming_error ("ignoring weird minimum distance");
       return;
     }
 
@@ -172,7 +172,7 @@ void
 Simple_spacer::set_active_states ()
 {
   /* float comparison is safe, since force is only copied.  */
-  for (int i = 0; i <springs_.size (); i++)
+  for (int i = 0; i < springs_.size (); i++)
     if (springs_[i].is_active_
        && springs_[i].block_force_ >= force_)
       {
@@ -335,7 +335,6 @@ Simple_spacer_wrapper::solve (Column_x_positions *positions, bool ragged)
          if (scm_to_double (p) > 9999)
            break_satisfy = break_satisfy && ! (i == 0 || i == sz -1);
        }
-
     }
 
   positions->satisfies_constraints_
@@ -351,7 +350,7 @@ Simple_spacer::add_spring (Real ideal, Real hooke)
   desc.hooke_ = hooke;
   if (!desc.is_sane ())
     {
-      programming_error ("Insane spring found. Setting to unit spring.");
+      programming_error ("insane spring found, setting to unit");
 
       desc.hooke_ = 1.0;
       desc.ideal_ = 1.0;
@@ -424,7 +423,8 @@ Simple_spacer_wrapper::add_columns (Link_array<Grob> const &icols)
        {
          Grob *other = unsmob_grob (scm_caar (s));
          int oi = binsearch_links (cols, other, &compare_paper_column_rank);
-         if (oi >= 0)
+         if (oi >= 0
+             && cols[oi] == other)
            {
              spacer_->add_rod (i, oi, scm_to_double (scm_cdar (s)));
            }