Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index fe10a90a5b02e0ad5b7d6ffcfcd6f3a09d5b2553..0c595f1d94b165c66a652ef31918f843f1892f67 100644 (file)
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -289,12 +289,7 @@ struct Rod_desc
     return r_ < r.r_;
   }
 
-  Rod_desc ()
-  {
-    r_ = 0;
-    dist_ = 0;
-  }
-
+  Rod_desc () {}
   Rod_desc (vsize r, Real d)
   {
     r_ = r;
@@ -310,17 +305,7 @@ struct Column_desc
   Real inverse_hooke_;
   Real end_ideal_;
   Real end_inverse_hooke_;
-  SCM break_permission_;
   Interval keep_inside_line_;
-
-  Column_desc ()
-  {
-    ideal_ = 0;
-    inverse_hooke_ = 0;
-    end_ideal_ = 0;
-    end_inverse_hooke_ = 0;
-    break_permission_ = SCM_EOL;
-  }
 };
 
 static int compare_paper_column_rank (Grob *const &a, Grob *const &b);
@@ -416,7 +401,6 @@ get_column_desc (vector<Grob*> const &cols, vsize col_index, bool line_starter)
     }
   if (!line_starter && to_boolean (col->get_property ("keep-inside-line")))
     desc.keep_inside_line_ = col->extent (col, X_AXIS);
-  desc.break_permission_ = col->get_property ("line-break-permission");
   return desc;
 }
 
@@ -425,12 +409,10 @@ get_line_forces (vector<Grob*> const &icols, vector<vsize> breaks,
                 Real line_len, Real indent, bool ragged)
 {
   vector<Real> force;
-  force.resize (breaks.size () * breaks.size (), infinity_f);
+  force.resize (breaks.size () * breaks.size ());
 
   vector<Column_desc> cols;
   vsize b = 1;
-  SCM force_break = ly_symbol2scm ("force");
-
   cols.push_back (Column_desc ());
   for (vsize i = 1; i < icols.size () - 1; i++)
     {
@@ -475,9 +457,6 @@ get_line_forces (vector<Grob*> const &icols, vector<vsize> breaks,
            }
          spacer.solve ((b == 0) ? line_len - indent : line_len, ragged);
          force[b * breaks.size () + c] = spacer.force ();
-
-         if (cols[end].break_permission_ == force_break)
-           break;
          if (!spacer.fits ())
            {
              force[b * breaks.size () + c] = infinity_f;
@@ -518,15 +497,8 @@ get_line_configuration (vector<Grob*>const &columns,
       spacer.add_spring (cols[i].ideal_, cols[i].inverse_hooke_);
     }
   for (vsize i = 0; i < cols.size (); i++)
-    {
-      for (vsize r = 0; r < cols[i].rods_.size (); r++)
-       spacer.add_rod (i, cols[i].rods_[r].r_, cols[i].rods_[r].dist_);
-      if (!cols[i].keep_inside_line_.is_empty ())
-       {
-         spacer.add_rod (i, cols.size (), cols[i].keep_inside_line_[RIGHT]);
-         spacer.add_rod (0, i, cols[i].keep_inside_line_[LEFT]);
-       }
-    }
+    for (vsize r = 0; r < cols[i].rods_.size (); r++)
+      spacer.add_rod (i, cols[i].rods_[r].r_, cols[i].rods_[r].dist_);
 
   spacer.solve (line_len, ragged);
   ret.force_ = spacer.force ();