X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcolumn-x-positions.cc;h=134f84b73b80f1d49915016287364d76136efbc8;hb=d6e2f16f3eacba9b4a23c30a4f235af8f71a43d5;hp=91c616fcb079c0b43163f19288693bad34a0deb0;hpb=d1965f31e75a5e1e9faeb995ef2d37ce5fb3ff85;p=lilypond.git

diff --git a/lily/column-x-positions.cc b/lily/column-x-positions.cc
index 91c616fcb0..134f84b73b 100644
--- a/lily/column-x-positions.cc
+++ b/lily/column-x-positions.cc
@@ -1,47 +1,15 @@
 /*
-  colhpos.cc -- implement Column_x_positions
+  column-x-positions.cc -- implement Column_x_positions
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "column-x-positions.hh"
-#include "simple-spacer.hh"	// ugh
-#include "real.hh"
-#include "debug.hh"
 
-Column_x_positions::Column_x_positions()
+Column_x_positions::Column_x_positions ()
 {
-  energy_f_ = infinity_f;
-  satisfies_constraints_b_ = false;
-  spacer_l_ =0;
+  satisfies_constraints_ = true;
+  force_ = 0;
 }
-
-Column_x_positions::~Column_x_positions()
-{
-
-}
-
-void
-Column_x_positions::add_paper_column (Paper_column*c)
-{
-  cols_.push (c);
-}
-
-void
-Column_x_positions::print() const
-{
-#ifndef NPRINT
-  DEBUG_OUT << "energy : " << energy_f_ << '\n';
-  DEBUG_OUT << "line of " << config_.size() << " cols\n";
-#endif
-}
-
-
-
-
-
-
-
-