release: 1.2.14

[lilypond.git] / lily / column-x-positions.cc

diff --git a/lily/column-x-positions.cc b/lily/column-x-positions.cc
index 4ac09b029c4a7b43406e2d3f3599b753c4a087b3..91c616fcb079c0b43163f19288693bad34a0deb0 100644 (file)
--- a/lily/column-x-positions.cc
+++ b/lily/column-x-positions.cc
@@ -7,9 +7,9 @@
 */
 
 #include "column-x-positions.hh"
+#include "simple-spacer.hh"    // ugh
 #include "real.hh"
 #include "debug.hh"
-#include "line-spacer.hh"
 
 Column_x_positions::Column_x_positions()
 {
@@ -38,32 +38,10 @@ Column_x_positions::print() const
 #endif
 }
 
-void
-Column_x_positions::OK() const
-{
-#ifndef NDEBUG
-  assert (config_.size() == cols_.size ());
-#endif
-}
 
 
-void
-Column_x_positions::stupid_solution()
-{
-  //  set_stupid_solution (spacer_l_->default_solution());
-}
 
-void
-Column_x_positions::solve_line() 
-{
-  spacer_l_->solve (this);
-}
 
 
-void
-Column_x_positions::approximate_solve_line() 
-{
-  spacer_l_->lower_bound_solution (this);
-}