(get_system_specs): separate generation of

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

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index fb158915422a3b7d182407a1cb25ae9e89422020..bc0ee2c3f66709350544c75cd70331fbb3dac5a1 100644 (file)
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -3,23 +3,23 @@
 
   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 "column-x-positions.hh"
+#include "dimensions.hh"
+#include "international.hh"
 #include "libc-extension.hh"   // isinf
-#include "simple-spacer.hh"
 #include "paper-column.hh"
+#include "simple-spacer.hh"
+#include "spaceable-grob.hh"
 #include "spring.hh"
 #include "warn.hh"
-#include "column-x-positions.hh"
-#include "spaceable-grob.hh"
-#include "dimensions.hh"
 
 /*
   A simple spacing constraint solver. The approach:
@@ -132,11 +132,9 @@ Real
 Simple_spacer::active_blocking_force () const
 {
   Real bf = -infinity_f;
-  for (int i = 0; i < springs_.size (); i++)
+  for (vsize 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;
 }
 
@@ -153,7 +151,7 @@ Simple_spacer::active_springs_stiffness () const
 
       Real max_block_force = -infinity_f;
       int max_i = -1;
-      for (int i = 0; i < springs_.size (); i++)
+      for (vsize i = 0; i < springs_.size (); i++)
        {
          if (springs_[i].block_force_ > max_block_force)
            {
@@ -171,7 +169,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 (vsize i = 0; i < springs_.size (); i++)
     if (springs_[i].is_active_
        && springs_[i].block_force_ >= force_)
       {
@@ -184,7 +182,7 @@ Real
 Simple_spacer::configuration_length () const
 {
   Real l = 0.;
-  for (int i = 0; i < springs_.size (); i++)
+  for (vsize i = 0; i < springs_.size (); i++)
     l += springs_[i].length (force_);
 
   return l;
@@ -294,11 +292,11 @@ Simple_spacer_wrapper::solve (Column_x_positions *positions, bool ragged)
     We used to have a penalty for compression, no matter what, but that
     fucked up wtk1-fugue2 (taking 3 full pages.)
   */
-  positions->config_.push (spacer_->indent_);
-  for (int i = 0; i < spacer_->springs_.size (); i++)
+  positions->config_.push_back (spacer_->indent_);
+  for (vsize i = 0; i < spacer_->springs_.size (); i++)
     {
       Real l = spacer_->springs_[i].length ((ragged) ? 0.0 : spacer_->force_);
-      positions->config_.push (positions->config_.top () + l);
+      positions->config_.push_back (positions->config_.back () + l);
       /*
        we have l>= 0 here, up to rounding errors
       */
@@ -311,7 +309,7 @@ Simple_spacer_wrapper::solve (Column_x_positions *positions, bool ragged)
   if (ragged)
     {
       positions->satisfies_constraints_
-       = positions->config_.top () < spacer_->line_len_;
+       = positions->config_.back () < spacer_->line_len_;
     }
   else
     positions->satisfies_constraints_ = spacer_->is_active ();
@@ -356,20 +354,18 @@ 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_++;
     }
-  springs_.push (desc);
+  springs_.push_back (desc);
 }
 
 static int
@@ -380,23 +376,23 @@ compare_paper_column_rank (Grob *const &a,
 }
 
 void
-Simple_spacer_wrapper::add_columns (Link_array<Grob> const &icols)
+Simple_spacer_wrapper::add_columns (vector<Grob*> const &icols)
 {
-  Link_array<Grob> cols (icols);
+  vector<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 (vsize i = 0; i < icols.size (); i++)
+    if (scm_is_pair (icols[i]->get_object ("between-cols")))
+      loose_cols_.push_back (icols[i]);
+    else
+      cols.push_back (icols[i]);
 
   spaced_cols_ = cols;
-  for (int i = 0; i < cols.size () - 1; i++)
+  for (vsize 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))
        {
@@ -416,22 +412,19 @@ Simple_spacer_wrapper::add_columns (Link_array<Grob> const &icols)
       spacer_->add_spring (ideal, inverse_hooke);
     }
 
-  for (int i = 0; i < cols.size () - 1; i++)
+  for (vsize i = 0; i < cols.size () - 1; i++)
     {
       for (SCM s = Spaceable_grob::get_minimum_distances (cols[i]);
           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)));
-           }
+         vsize j = binary_search (cols, other, &compare_paper_column_rank);
+         if (j != VPOS && 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 ())