release: 0.1.12

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

diff --git a/lily/col-info.cc b/lily/col-info.cc
index deb2dee7308191acecace5d4a7cddfbb99fd9c61..086b7c7e3e9492a9db256872c6f4ab931755a695 100644 (file)
--- a/lily/col-info.cc
+++ b/lily/col-info.cc
@@ -14,28 +14,30 @@ void
 Colinfo::print() const
 {
 #ifndef NPRINT
-    DOUT << "column { ";
-    if (fixed())
-       DOUT << "fixed at " << fixed_position()<<", ";
-    assert (pcol_l_);
-    DOUT << "[" << minleft() << ", " << minright () << "]";
-    DOUT <<"}\n";
+  DOUT << "column { ";
+  if (fixed())
+    DOUT << "fixed at " << fixed_position()<<", ";
+  assert (pcol_l_);
+  DOUT << "[" << minleft() << ", " << minright () << "]";
+  DOUT <<"}\n";
 #endif
 }
 
-Colinfo::Colinfo (PCol *col_l, Real const *fixed_C)
+Colinfo::Colinfo (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();
+  if (fixed_C)
+    fixpos_p_.set_l (fixed_C);
+  ugh_b_ = false;
+  pcol_l_ = col_l;
+  width = pcol_l_->width();
+  if (width.empty_b())
+    width = Interval(0,0);
 }
 
 
 Colinfo::Colinfo()
 {
-    ugh_b_ = false;
-    pcol_l_ =0;
+  ugh_b_ = false;
+  pcol_l_ =0;
 }