release: 1.3.40

[lilypond.git] / lily / idealspacing.cc

diff --git a/lily/idealspacing.cc b/lily/idealspacing.cc
index 64c1866fd8b3a95a71ece28c1db826e31d51a873..d7379218f162c57b43c29b8d84ecd083d8bb2198 100644 (file)
--- a/lily/idealspacing.cc
+++ b/lily/idealspacing.cc
@@ -3,21 +3,21 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "idealspacing.hh"
-#include "p-col.hh"
-#include "p-score.hh"
+#include "paper-column.hh"
+#include "paper-score.hh"
 #include "debug.hh"
 
 void
 Idealspacing::print() const
 {
 #ifndef NPRINT
-  DOUT << "idealspacing {" ;
-  DOUT << "distance "<<space_f_<< " strength " << hooke_f_ ;
-  DOUT << "left " << left_i_ << " right " << right_i_ << "}\n";
+  DEBUG_OUT << "idealspacing {" ;
+  DEBUG_OUT << "distance " << space_f_ << " strength " << hooke_f_;
+  DEBUG_OUT << "left " << cols_drul_[LEFT] << " right " << cols_drul_[RIGHT] << "}\n";
 #endif
 }
 
@@ -25,8 +25,7 @@ Idealspacing::Idealspacing()
 {
   space_f_ = 0.0;
   hooke_f_ = 0.0;
-  left_i_ = -1;
-  right_i_ = -1;
+  cols_drul_[LEFT] = cols_drul_[RIGHT] = -1;
 }
 
 void