lilypond-0.0.20

diff --git a/hdr/request.hh b/hdr/request.hh
index d8ee21ccc780cecaa538084cd952592c6ab52d16..279947a21cab04c7bdea14633bea6d86f279e25a 100644 (file)
--- a/hdr/request.hh
+++ b/hdr/request.hh
@@ -4,6 +4,7 @@
 
 #include "glob.hh"
 #include "string.hh"
+#include "moment.hh"
 
 /// a voice element wants something printed
 struct Request {
@@ -21,7 +22,7 @@ struct Request {
     virtual Beam_req *beam() { return 0 ; }
     virtual Slur_req *slur() { return 0 ; }
     virtual  Rhythmic_req*rhythmic() { return 0;}
-    virtual Real duration() const { return 0.0; }
+    virtual Moment duration() const { return 0.0; }
     virtual Request* clone() const =0;
 };
 
@@ -63,7 +64,7 @@ struct Rhythmic_req : Request {
     
     /****************/
 
-    Real duration() const;
+    Moment duration() const;
     Rhythmic_req();
     Rhythmic_req*rhythmic() { return this;}
     void print ()const;
@@ -207,7 +208,7 @@ try to put an appropriate number over the bracket
 
 /// helper in the hierarchy
 struct Dynamic {
-    Real subtime;
+    Moment subtime;
 };
 /** Each dynamic is bound to one note ( a crescendo spanning multiple
     notes is thought to be made of two "dynamics": a start and a stop).

diff --git a/src/score.cc b/src/score.cc
index 5a65809c5ac73255bd00c89119f647ce760728f0..1593f7be162074892807336c19ef3d5076ebd3d8 100644 (file)
--- a/src/score.cc
+++ b/src/score.cc
@@ -68,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);
@@ -98,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++) {
@@ -121,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;
 }