release: 0.0.21

[lilypond.git] / hdr / simplewalker.hh

diff --git a/hdr/simplewalker.hh b/hdr/simplewalker.hh
index 2631f8b983753f31bb36857403f326907398f51f..635b9fbbcc66b737d2a32f3ac4d1d73875383219 100644 (file)
--- a/hdr/simplewalker.hh
+++ b/hdr/simplewalker.hh
@@ -24,13 +24,10 @@ struct Simple_walker: Staff_walker {
     bool processed_clef;
     Clef clef_;
     Rhythmic_grouping default_grouping;
-    Rhythmic_grouping current_grouping;
-    
+    Rhythmic_grouping *current_grouping;
     svec<Slur_req*> pending_slur_reqs;
     svec<Slur*>  pending_slurs;
-
-
-
+    
     /****************/
 
     virtual void do_TYPESET_command(Command*);
@@ -38,12 +35,12 @@ struct Simple_walker: Staff_walker {
     virtual void process_requests();
     virtual void reset();
     
-    void do_note(Rhythmic_req*);
+    void do_note(Note_info);
     Simple_walker(Simple_staff*);
     Simple_column *col();
     Simple_staff *staff();
 
-    void do_local_key(Note_req*n);
+    void do_local_key(Note_req*, Notehead*);
     int find_slur(const Voice*v);
 };