From d9d9845c0e7a65b198126e2ddb5f0372e78eac96 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:56:36 +0000 Subject: [PATCH] lilypond-0.1.22 --- lily/col-info.cc | 8 ++++---- lily/include/col-info.hh | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lily/col-info.cc b/lily/col-info.cc index 086b7c7e3e..83c7f61fbc 100644 --- a/lily/col-info.cc +++ b/lily/col-info.cc @@ -18,7 +18,7 @@ Colinfo::print() const if (fixed()) DOUT << "fixed at " << fixed_position()<<", "; assert (pcol_l_); - DOUT << "[" << minleft() << ", " << minright () << "]"; + DOUT << width_.str(); DOUT <<"}\n"; #endif } @@ -29,9 +29,9 @@ Colinfo::Colinfo (Paper_column *col_l, Real const *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); + width_ = pcol_l_->width(); + if (width_.empty_b()) + width_ = Interval(0,0); } diff --git a/lily/include/col-info.hh b/lily/include/col-info.hh index 505c11f991..46f6cf20c3 100644 --- a/lily/include/col-info.hh +++ b/lily/include/col-info.hh @@ -18,7 +18,7 @@ struct Colinfo { Paper_column *pcol_l_; P fixpos_p_; - Interval width; + Interval width_; int rank_i_; /// did some tricks to make this column come out. bool ugh_b_; @@ -29,8 +29,6 @@ struct Colinfo { void print() const; bool fixed() const { return fixpos_p_.get_C();} Real fixed_position() const { return *fixpos_p_; } - Real minright() const { return width.right; } - Real minleft() const { return -width.left; } }; #endif // COL_INFO_HH -- 2.39.5