release: 0.0.20

[lilypond.git] / src / score.cc

diff --git a/src/score.cc b/src/score.cc
index ca468ee6ae3c71698dd5a8448801ee08fc090e26..1593f7be162074892807336c19ef3d5076ebd3d8 100644 (file)
--- a/src/score.cc
+++ b/src/score.cc
@@ -10,7 +10,7 @@
 void
 Score::process()
 {
-    *mlog << "Processing ... ";
+    *mlog << "\nProcessing ... ";
     
     assert (paper_);
     
@@ -24,8 +24,9 @@ Score::process()
 
     // do this after processing, staffs first have to generate PCols.
     do_pcols();
-    // ugh. Would want to clean the columns before anything else.
-    clean_cols();
+
+    clean_cols();    // can't move this farther up.
+
     calc_idealspacing();
 
     // debugging
@@ -67,7 +68,7 @@ Score::clean_cols()
   */
 // todo
 PCursor<Score_column*>
-Score::create_cols(Real w)
+Score::create_cols(Moment w)
 {
     Score_column* c1 = new Score_column(w);
     Score_column* c2 = new Score_column(w);
@@ -97,7 +98,7 @@ Score::create_cols(Real w)
 }
 
 PCursor<Score_column*>
-Score::find_col(Real w,bool mus)
+Score::find_col(Moment w,bool mus)
 {
     PCursor<Score_column*> i(cols_);
     for (; i.ok(); i++) {
@@ -120,12 +121,12 @@ Score::do_pcols()
        pscore_->add(i->pcol_);
     }
 }
-Real
+Moment
 Score::last() const
 {    
-    Real l = 0;
+    Moment l = 0;
     for (PCursor<Staff*> i(staffs_); i.ok(); i++) {
-       l = MAX(l, i->last());
+       l = l>? i->last();
     }
     return l;
 }