* The grand 2005-2006 replace.

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

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index 6464651a27dc7bb060e4b670c324b841be966e58..a9c70489dd060345fd1aa0ed7ac4c92b83b78322 100644 (file)
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -3,14 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   TODO:
   - add support for different stretch/shrink constants?
 */
 
 #include <cstdio>
-#include <math.h>
 
 #include "libc-extension.hh"   // isinf
 #include "simple-spacer.hh"
@@ -134,9 +133,7 @@ Simple_spacer::active_blocking_force () const
   Real bf = -infinity_f;
   for (int i = 0; i < springs_.size (); i++)
     if (springs_[i].is_active_)
-      {
-       bf = max (bf, springs_[i].block_force_);
-      }
+      bf = max (bf, springs_[i].block_force_);
   return bf;
 }
 
@@ -356,15 +353,13 @@ Simple_spacer::add_spring (Real ideal, Real inverse_hooke)
     }
 
   if (!inverse_hooke)
-    {
-      desc.is_active_ = false;
-    }
+    desc.is_active_ = false;
   else
     {
       /*
        desc.is_active_ ?
       */
-      desc.block_force_ = - desc.ideal_ / desc.inverse_hooke_;
+      desc.block_force_ = -desc.ideal_ / desc.inverse_hooke_;
       // block at distance 0
 
       active_count_++;
@@ -383,13 +378,13 @@ void
 Simple_spacer_wrapper::add_columns (Link_array<Grob> const &icols)
 {
   Link_array<Grob> cols (icols);
+  cols.clear ();
 
-  for (int i = cols.size (); i--;)
-    if (scm_is_pair (cols[i]->get_object ("between-cols")))
-      {
-       loose_cols_.push (cols[i]);
-       cols.del (i);
-      }
+  for (int i = 0; i < icols.size (); i++)
+    if (scm_is_pair (icols[i]->get_object ("between-cols")))
+      loose_cols_.push (icols[i]);
+    else
+      cols.push (icols[i]);
 
   spaced_cols_ = cols;
   for (int i = 0; i < cols.size () - 1; i++)
@@ -424,9 +419,7 @@ Simple_spacer_wrapper::add_columns (Link_array<Grob> const &icols)
          Grob *other = unsmob_grob (scm_caar (s));
          int j = binsearch_links (cols, other, &compare_paper_column_rank);
          if (j >= 0 && cols[j] == other)
-           {
-             spacer_->add_rod (i, j, scm_to_double (scm_cdar (s)));
-           }
+           spacer_->add_rod (i, j, scm_to_double (scm_cdar (s)));
        }
 
       if (i