lilypond-0.0.21

diff --git a/src/inputcommands.cc b/src/inputcommands.cc
index e1d40465614488dba2792e45ef822bc04f2fc765..64e8fa9598ef7e6a9fe950d12de4d90a77b66d4a 100644 (file)
--- a/src/inputcommands.cc
+++ b/src/inputcommands.cc
@@ -11,7 +11,7 @@ Commands_at::print() const
 #ifndef NPRINT
     mtor << "Commands_at {";
     tdescription_.print();
-    for (PCursor<Input_command *> cc(*this); cc.ok(); cc++) 
+    for (iter_top(*this,cc); cc.ok(); cc++) 
        cc->print();
     mtor << "}\n";
 #endif
@@ -69,7 +69,7 @@ void
 Commands_at::parse(Staff_commands_at*s)
 {
     s->tdescription_ = tdescription_;
-    for (PCursor<Input_command *> cc(*this); cc.ok(); cc++) {
+    for (iter_top(*this,cc); cc.ok(); cc++) {
        if (cc->args.sz() &&  cc->args[0] !="") {
            Command c = **cc;
            s->add(c);
@@ -175,7 +175,7 @@ Input_commands::parse() const
     print();
     Staff_commands*nc = new Staff_commands;
 
-    for (PCursor<Commands_at*> i(*this); i.ok(); i++) {
+    for (iter_top(*this,i); i.ok(); i++) {
 
        Staff_commands_at* s= nc->find(i->when());
        if (!s){
@@ -200,7 +200,7 @@ void
 Input_commands::print() const
 {
 #ifndef NPRINT
-    for (PCursor<Commands_at*> cc(*this); cc.ok() ; cc++) {
+    for (iter_top(*this,cc); cc.ok() ; cc++) {
        cc->print();
     }
 #endif

diff --git a/src/inputmusic.cc b/src/inputmusic.cc
index b007562d1c178c880f4d455d6ec0e0305d55346b..80f0a258a73b3f0927aee2a2ee1313e806d2a52e 100644 (file)
--- a/src/inputmusic.cc
+++ b/src/inputmusic.cc
@@ -47,14 +47,14 @@ Complex_music::add(Input_music*v)
 void
 Complex_music::print() const
 {
-    for (PCursor<Input_music*> i(elts); i.ok(); i++)
+    for (iter_top(elts,i); i.ok(); i++)
         i->print();
 }
 
 void
 Complex_music::concatenate(Complex_music*h)
 {
-    for (PCursor<Input_music*> i(h->elts); i.ok(); i++)
+    for (iter_top(h->elts,i); i.ok(); i++)
        add(i->clone());    
 }
 
@@ -64,7 +64,7 @@ Complex_music::Complex_music()
 
 Complex_music::Complex_music(Complex_music const&s)
 {
-    for (PCursor<Input_music*> i(s.elts); i.ok(); i++)
+    for (iter_top(s.elts,i); i.ok(); i++)
        add(i->clone());
 }
 
@@ -98,7 +98,7 @@ Music_voice::length()
 {
     Moment l = 0.0;
     
-    for (PCursor<Input_music*> i(elts); i.ok(); i++)
+    for (iter_top(elts,i); i.ok(); i++)
        l += i->length();
     return l;
 }
@@ -110,13 +110,12 @@ Music_voice::convert()
     Voice_list l;
     Moment here = 0.0;
     
-    for (PCursor<Input_music*> i(elts); i.ok(); i++) {
+    for (iter_top(elts,i); i.ok(); i++) {
        Moment len = i->length();       
        Voice_list k(i->convert());
        k.translate_time(here); 
        l.concatenate(k);
-       here +=len;
-       
+       here +=len;     
     }
     return l;    
 }
@@ -150,7 +149,7 @@ Music_general_chord::print() const
 void
 Music_general_chord::translate_time(Moment t)
 {
-    for (PCursor<Input_music*> i(elts); i.ok(); i++) 
+    for (iter_top(elts,i); i.ok(); i++) 
        i->translate_time(t);    
 }
 
@@ -159,7 +158,7 @@ Music_general_chord::length()
 {
     Moment l =0.0;
     
-    for (PCursor<Input_music*> i(elts); i.ok(); i++) 
+    for (iter_top(elts,i); i.ok(); i++) 
        l = l >? i->length();
     return l;
 }
@@ -168,7 +167,7 @@ Voice_list
 Music_general_chord::convert()
 {
     Voice_list l;
-    for (PCursor<Input_music*> i(elts); i.ok(); i++) {
+    for (iter_top(elts,i); i.ok(); i++) {
        Voice_list k(i->convert());
        l.concatenate(k);
     }
@@ -181,7 +180,7 @@ Music_general_chord::convert()
 void
 Voice_list::translate_time(Moment x)
 {
-    for (PCursor<Voice*> i(*this); i.ok(); i++)
+    for (iter_top(*this,i); i.ok(); i++)
        i->start += x;    
 }
 

diff --git a/src/inputstaff.cc b/src/inputstaff.cc
index 4a38d38bc120ab6c9f71a47c3dba4149d51062a4..97622a9dab808840dddf81196bedf73e536a19b1 100644 (file)
--- a/src/inputstaff.cc
+++ b/src/inputstaff.cc
@@ -39,15 +39,15 @@ Input_staff::parse(PointerList<Input_command*> score_wide)
     else if (type == "rhythmic")
        p = new Rhythmic_staff;
 
-    for (PCursor<Input_music*> i(music_); i.ok(); i++) {
+    for (iter_top(music_,i); i.ok(); i++) {
        Voice_list vl = i->convert();
        p->add(vl);
     }
 
     Input_commands commands;
-    for (PCursor<Input_command*> i(score_wide); i.ok(); i++) 
+    for (iter_top(score_wide,i); i.ok(); i++) 
        commands.add(**i);
-    for (PCursor<Input_command*> i(commands_); i.ok(); i++) 
+    for (iter_top(commands_,i); i.ok(); i++) 
        commands.add(**i);
 
     p->staff_commands_ = commands.parse();
@@ -57,9 +57,9 @@ Input_staff::parse(PointerList<Input_command*> score_wide)
 
 Input_staff::Input_staff(Input_staff&s)
 {
-    for (PCursor<Input_command*> i(s.commands_); i.ok(); i++)
+    for (iter_top(s.commands_,i); i.ok(); i++)
        commands_.bottom().add(new Input_command(**i));
-    for (PCursor<Input_music*> i(s.music_); i.ok(); i++)
+    for (iter_top(s.music_,i); i.ok(); i++)
        add(i);
 
     type = s.type;
@@ -70,9 +70,9 @@ Input_staff::print() const
 {
 #ifndef NPRINT
     mtor << "Input_staff {\n";
-    for (PCursor<Input_command*> i(commands_); i.ok(); i++)
+    for (iter_top(commands_,i); i.ok(); i++)
        i->print();
-    for (PCursor<Input_music*> i(music_); i.ok(); i++)
+    for (iter_top(music_,i); i.ok(); i++)
        i->print();
     mtor << "}\n";
 #endif

diff --git a/src/staff.cc b/src/staff.cc
index ef0ff53e58707641c35eeb0a9b1b00f0e0186be9..825e878d8a8d8b11c39ea1270651a3b64e36b797 100644 (file)
--- a/src/staff.cc
+++ b/src/staff.cc
@@ -10,7 +10,7 @@
 void
 Staff::add(PointerList<Voice*> &l)
 {
-    for (PCursor<Voice*> i(l); i.ok(); i++)
+    for (iter_top(l,i); i.ok(); i++)
        voices.bottom().add(i);
 }
 
@@ -30,7 +30,7 @@ Staff::paper() const
 void
 Staff::clean_cols()
 {
-    PCursor<Staff_column *> i(cols);
+    iter_top(cols,i);
     for(; i.ok(); ){
        if (!i->score_column->used())
            i.del();
@@ -45,7 +45,7 @@ Staff::get_col(Moment w, bool mus)
     Score_column* sc = score_->find_col(w,mus);
     assert(sc->when == w);
     
-    PCursor<Staff_column *> i(cols);
+    iter_top(cols,i);
     for (; i.ok(); i++) {
        if (*i->score_column > *sc) // too far
            break;
@@ -88,9 +88,9 @@ Staff::get_col(Moment w, bool mus)
 void
 Staff::setup_staffcols()
 {    
-    for (PCursor<Voice*> i(voices); i.ok(); i++) {
+    for (iter_top(voices,i); i.ok(); i++) {
        Moment now = i->start;
-       for (PCursor<Voice_element *> ve(i->elts); ve.ok(); ve++) {
+       for (iter_top(i->elts,ve); ve.ok(); ve++) {
 
            Staff_column *sc=get_col(now,true);
            sc->add(ve);
@@ -98,14 +98,14 @@ Staff::setup_staffcols()
        }       
     }
 
-    for (PCursor<Staff_commands_at*> cc(*staff_commands_); cc.ok(); cc++) {
+    for (iter_top(*staff_commands_,cc); cc.ok(); cc++) {
        Staff_column *sc=get_col(cc->tdescription_.when,false);
        sc->s_commands = cc;
        sc->tdescription_ = new Time_description(cc->tdescription_);
     }
 
-    PCursor<Staff_commands_at*> cc(*staff_commands_);
-    for (PCursor<Staff_column*> i(cols); i.ok(); i++) {
+    iter_top(*staff_commands_,cc);
+    for (iter_top(cols,i); i.ok(); i++) {
        while  ((cc+1).ok() && (cc+1)->when() < i->when())
            cc++;
 
@@ -142,7 +142,7 @@ Moment
 Staff::last() const
 {
     Moment l = 0.0;
-    for (PCursor<Voice*> i(voices); i.ok(); i++) {
+    for (iter_top(voices,i); i.ok(); i++) {
        l = l >? i->last();
     }
     return l;
@@ -154,7 +154,7 @@ Staff::print() const
 {
 #ifndef NPRINT
     mtor << "Staff {\n";
-    for (PCursor<Voice*> i(voices); i.ok(); i++) {
+    for (iter_top(voices,i); i.ok(); i++) {
        i->print();     
     }
     if (staff_commands_)