release: 1.2.0

[lilypond.git] / lily / col-info.cc

diff --git a/lily/col-info.cc b/lily/col-info.cc
index 581a9491b74db9a14cee9babe7a2179000cb2e59..2ebfd15d4f06ab5313a04a9bb18c25efe54bce7e 100644 (file)
--- a/lily/col-info.cc
+++ b/lily/col-info.cc
@@ -3,10 +3,10 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "p-col.hh"
+#include "paper-column.hh"
 #include "col-info.hh"
 #include "debug.hh"
 
@@ -33,9 +33,8 @@ Column_info::Column_info (Paper_column *col_l, Real const *fixed_C)
 {
   if (fixed_C)
     fixpos_p_.set_l (fixed_C);
-  ugh_b_ = false;
   pcol_l_ = col_l;
-  width_ = pcol_l_->width();
+  width_ = pcol_l_->extent(X_AXIS);
   if (width_.empty_b())
     width_ = Interval(0,0);
 }
@@ -43,7 +42,6 @@ Column_info::Column_info (Paper_column *col_l, Real const *fixed_C)
 
 Column_info::Column_info()
 {
-  ugh_b_ = false;
   pcol_l_ =0;
 }