release: 0.0.21

[lilypond.git] / hdr / simplewalker.hh

diff --git a/hdr/simplewalker.hh b/hdr/simplewalker.hh
index 5f27957aca2092b5afa268b3a69524bca89697a8..635b9fbbcc66b737d2a32f3ac4d1d73875383219 100644 (file)
--- a/hdr/simplewalker.hh
+++ b/hdr/simplewalker.hh
@@ -8,6 +8,7 @@
 #define SIMPLEWALKER_HH
 
 #include "proto.hh"
+#include "grouping.hh"
 
 struct Simple_walker: Staff_walker {
     Stem *stem_;
@@ -22,6 +23,10 @@ struct Simple_walker: Staff_walker {
     bool processed_key;
     bool processed_clef;
     Clef clef_;
+    Rhythmic_grouping default_grouping;
+    Rhythmic_grouping *current_grouping;
+    svec<Slur_req*> pending_slur_reqs;
+    svec<Slur*>  pending_slurs;
     
     /****************/
 
@@ -30,12 +35,13 @@ struct Simple_walker: Staff_walker {
     virtual void process_requests();
     virtual void reset();
     
-    void do_notes();
+    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);
 };