(Paper_column): copy rank_. This fixes

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

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index 3026e488955c71ab4b1e5e2825516290dc923e62..d2578746665ae7fd9540ca80e794e3505539434f 100644 (file)
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -9,20 +9,21 @@
   - add support for different stretch/shrink constants?
   
 */
-#include <stdio.h>
+
+#include "simple-spacer.hh"
+
+#include <cstdio>
 #include <math.h>
+
 #include <libc-extension.hh>   // isinf
 
-#include "simple-spacer.hh"
 #include "paper-column.hh"
 #include "spring.hh"
-#include "rod.hh"
 #include "warn.hh"
 #include "column-x-positions.hh"
 #include "spaceable-grob.hh"
 #include "dimensions.hh"
 
-
 /*
    A simple spacing constraint solver. The approach:
 
@@ -70,7 +71,7 @@ Simple_spacer::Simple_spacer ()
   */
   active_count_ = 0;
   force_ = 0.;
-  indent_ =0.0;
+  indent_ = 0.0;
   default_space_ = 20 PT;
 }
 
@@ -115,7 +116,7 @@ Simple_spacer::add_rod (int l, int r, Real dist)
 Real
 Simple_spacer::range_ideal_len (int l, int r)   const
 {
-  Real d =0.;
+  Real d = 0.;
   for (int i=l; i < r; i++)
     d += springs_[i].ideal_;
   return d;
@@ -124,7 +125,7 @@ Simple_spacer::range_ideal_len (int l, int r)   const
 Real
 Simple_spacer::range_stiffness (int l, int r) const
 {
-  Real den =0.0;
+  Real den = 0.0;
   for (int i=l; i < r; i++)
     {
       if (springs_[i].is_active_)
@@ -138,7 +139,7 @@ Real
 Simple_spacer::active_blocking_force () const
 {
   Real bf = - infinity_f; 
-  for (int i=0; i < springs_.size (); i++)
+  for (int i= 0; i < springs_.size (); i++)
     if (springs_[i].is_active_)
       {
        bf = bf >? springs_[i].block_force_;
@@ -159,7 +160,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 (int i= 0; i < springs_.size (); i++)
        {
          if (springs_[i].block_force_ > max_block_force)
            {
@@ -177,7 +178,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_)
       {
@@ -189,8 +190,8 @@ Simple_spacer::set_active_states ()
 Real
 Simple_spacer::configuration_length () const
 {
-  Real l =0.;
-  for (int i=0; i < springs_.size (); i++)
+  Real l = 0.;
+  for (int i= 0; i < springs_.size (); i++)
     l += springs_[i].length (force_);
 
   return l;
@@ -268,7 +269,7 @@ LY_DEFINE(ly_solve_spring_rod_problem, "ly:solve-spring-rod-problem",
                   length, SCM_ARG3, __FUNCTION__, "number or #f");
 
 
-  bool is_ragged   = ragged == SCM_BOOL_T; 
+  bool is_ragged = ragged == SCM_BOOL_T; 
   Simple_spacer spacer; 
   for (SCM s = springs; scm_is_pair (s); s = scm_cdr (s))
     {
@@ -308,7 +309,7 @@ LY_DEFINE(ly_solve_spring_rod_problem, "ly:solve-spring-rod-problem",
     
   SCM force_return = SCM_BOOL_F;
   if (!isinf (spacer.force_)
-      && spacer.is_active ())
+      && (spacer.is_active () || is_ragged))
     {
       force_return = scm_from_double (spacer.force_);
     }
@@ -334,8 +335,8 @@ LY_DEFINE(ly_solve_spring_rod_problem, "ly:solve-spring-rod-problem",
 
 Spring_description::Spring_description ()
 {
-  ideal_ =0.0;
-  hooke_ =0.0;
+  ideal_ = 0.0;
+  hooke_ = 0.0;
   is_active_ = true;
   block_force_ = 0.0;
 }
@@ -389,7 +390,7 @@ Simple_spacer_wrapper::solve (Column_x_positions *positions, bool ragged)
     fucked up wtk1-fugue2 (taking 3 full pages.)
   */
   positions->config_.push (spacer_->indent_);
-  for (int i=0; i < spacer_->springs_.size (); i++)
+  for (int 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);
@@ -407,12 +408,11 @@ Simple_spacer_wrapper::solve (Column_x_positions *positions, bool ragged)
       positions->satisfies_constraints_ = 
        positions->config_.top () < spacer_->line_len_ ;
     }
-
+  else
+    positions->satisfies_constraints_ = spacer_->is_active ();
 
   positions->cols_ = spaced_cols_;
   positions->loose_cols_ = loose_cols_;
-  positions->satisfies_constraints_ =
-    positions->satisfies_constraints_ && spacer_->is_active ();
 
   /*
     Check if breaking constraints are met.
@@ -467,6 +467,13 @@ Simple_spacer::add_spring (Real ideal, Real hooke)
   springs_.push (desc);
 }
 
+static int
+compare_paper_column_rank (Grob  *const &a,
+                          Grob  *const &b)
+{
+  return Paper_column::get_rank (a) - Paper_column::get_rank (b); 
+}
+
 void
 Simple_spacer_wrapper::add_columns (Link_array<Grob> const &icols)
 {
@@ -480,7 +487,7 @@ Simple_spacer_wrapper::add_columns (Link_array<Grob> const &icols)
       }
   
   spaced_cols_ = cols;
-  for (int i=0; i < cols.size () - 1; i++)
+  for (int i= 0; i < cols.size () - 1; i++)
     {
       Spring_smob *spring = 0;
 
@@ -506,18 +513,29 @@ Simple_spacer_wrapper::add_columns (Link_array<Grob> const &icols)
       spacer_->add_spring (ideal, hooke);
     }
   
-  for (int i=0; i < cols.size () - 1; i++)
+  for (int 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 = cols.find_index (other);
+         int oi = binsearch_links (cols, other, &compare_paper_column_rank);
          if (oi >= 0)
            {
              spacer_->add_rod (i, oi, scm_to_double (scm_cdar (s)));
            }
        }
+
+      if (i
+         && !to_boolean  (cols[i]->get_property ("allow-outside-line")))
+       {
+         Interval e = cols[i]->extent (cols[i], X_AXIS);
+         if (!e.is_empty())
+           {
+             spacer_->add_rod (i, cols.size()-1, e[RIGHT]);
+             spacer_->add_rod (0, i, e[LEFT]);
+           }
+       }
     }
 }