* The grand 2005-2006 replace.

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

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index f23dfb84504eb71001f2214c90711d9a12867975..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"
@@ -122,7 +121,7 @@ Simple_spacer::range_stiffness (int l, int r) const
   for (int i = l; i < r; i++)
     {
       if (springs_[i].is_active_)
-       den += 1 / springs_[i].hooke_;
+       den += 1 * springs_[i].inverse_hooke_;
     }
 
   return 1 / den;
@@ -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;
 }
 
@@ -162,7 +159,7 @@ Simple_spacer::active_springs_stiffness () const
            }
        }
 
-      stiff = springs_[max_i].hooke_;
+      stiff = 1/springs_[max_i].inverse_hooke_;
     }
   return stiff;
 }
@@ -245,7 +242,7 @@ Simple_spacer::my_solve_natural_len ()
 Spring_description::Spring_description ()
 {
   ideal_ = 0.0;
-  hooke_ = 0.0;
+  inverse_hooke_ = 0.0;
   is_active_ = true;
   block_force_ = 0.0;
 }
@@ -253,7 +250,7 @@ Spring_description::Spring_description ()
 bool
 Spring_description::is_sane () const
 {
-  return (hooke_ > 0)
+  return (inverse_hooke_ >= 0)
     && ideal_ > 0
     && !isinf (ideal_) && !isnan (ideal_);
 }
@@ -263,7 +260,7 @@ Spring_description::length (Real f) const
 {
   if (!is_active_)
     f = block_force_;
-  return ideal_ + f / hooke_;
+  return ideal_ + f * inverse_hooke_;
 }
 /****************************************************************/
 
@@ -341,30 +338,29 @@ Simple_spacer_wrapper::solve (Column_x_positions *positions, bool ragged)
 }
 
 void
-Simple_spacer::add_spring (Real ideal, Real hooke)
+Simple_spacer::add_spring (Real ideal, Real inverse_hooke)
 {
   Spring_description desc;
 
   desc.ideal_ = ideal;
-  desc.hooke_ = hooke;
+  desc.inverse_hooke_ = inverse_hooke;
   if (!desc.is_sane ())
     {
       programming_error ("insane spring found, setting to unit");
 
-      desc.hooke_ = 1.0;
+      desc.inverse_hooke_ = 1.0;
       desc.ideal_ = 1.0;
     }
 
-  if (isinf (hooke))
-    {
-      desc.is_active_ = false;
-    }
+  if (!inverse_hooke)
+    desc.is_active_ = false;
   else
     {
       /*
        desc.is_active_ ?
       */
-      desc.block_force_ = -desc.hooke_ * desc.ideal_; // block at distance 0
+      desc.block_force_ = -desc.ideal_ / desc.inverse_hooke_;
+      // block at distance 0
 
       active_count_++;
     }
@@ -382,20 +378,20 @@ 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_property ("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++)
     {
       Spring_smob *spring = 0;
 
-      for (SCM s = cols[i]->get_property ("ideal-distances");
+      for (SCM s = cols[i]->get_object ("ideal-distances");
           !spring && scm_is_pair (s);
           s = scm_cdr (s))
        {
@@ -410,9 +406,9 @@ Simple_spacer_wrapper::add_columns (Link_array<Grob> const &icols)
                               Paper_column::get_rank (cols[i])));
 
       Real ideal = (spring) ? spring->distance_ : spacer_->default_space_;
-      Real hooke = (spring) ? spring->strength_ : 1.0;
+      Real inverse_hooke = (spring) ? spring->inverse_strength_ : 1.0;
 
-      spacer_->add_spring (ideal, hooke);
+      spacer_->add_spring (ideal, inverse_hooke);
     }
 
   for (int i = 0; i < cols.size () - 1; i++)
@@ -421,16 +417,13 @@ Simple_spacer_wrapper::add_columns (Link_array<Grob> const &icols)
           scm_is_pair (s); s = scm_cdr (s))
        {
          Grob *other = unsmob_grob (scm_caar (s));
-         int oi = binsearch_links (cols, other, &compare_paper_column_rank);
-         if (oi >= 0
-             && cols[oi] == other)
-           {
-             spacer_->add_rod (i, oi, scm_to_double (scm_cdar (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)));
        }
 
       if (i
-         && !to_boolean (cols[i]->get_property ("allow-outside-line")))
+         && to_boolean (cols[i]->get_property ("keep-inside-line")))
        {
          Interval e = cols[i]->extent (cols[i], X_AXIS);
          if (!e.is_empty ())