lilypond-0.0.32

diff --git a/hdr/staffwalker.hh b/hdr/staffwalker.hh
index 3b78c29c6b75493dfdc4c6ca0238ef6a40cbee39..aed371ef32d57d10bc28bac29fe16469fdc84919 100644 (file)
--- a/hdr/staffwalker.hh
+++ b/hdr/staffwalker.hh
@@ -1,14 +1,15 @@
-
 /*
-  staffwalker.hh -- part of LilyPond
-
+  staffwalker.hh -- declare Staff_walker
+  
   (c) 1996,97 Han-Wen Nienhuys
 */
 
 #ifndef STAFFWALKER_HH
 #define STAFFWALKER_HH
 
-#include "staff.hh"
+#include "proto.hh"
+#include "timedescription.hh"
+#include "pcursor.hh"
 
 /**
   manage run-time info when walking staffcolumns such as: key,
@@ -17,30 +18,28 @@
 struct Staff_walker : public PCursor<Staff_column*> {
     Staff * staff_l_;
     PScore * pscore_l_;
-
-    int break_status;
+    Score_walker *score_walk_l_;
+    Time_description time_;
+    Rhythmic_grouping *default_grouping;
     
     /* *************** */
 
-    int priority() const;              // Command
     Moment when() const;    
     virtual ~Staff_walker();
     Staff_walker(Staff*, PScore*);
     void process() ;
-    void process_command(Command *);
-    void operator++(int);
 
-    /* ***************
-      VIRTUAL
-     *************** */
+    void operator++(int);
+    void allow_break();
 
-    /// every time ++ is called
+protected:
+    /// every time before ++ is called
     virtual void do_pre_move(){}
+    /// every time after ++ is called
     virtual void do_post_move(){}
     virtual void process_requests()=0;
-    virtual void do_TYPESET_command(Command*)=0;
-    virtual void do_INTERPRET_command(Command*)=0 ;
 private:
+    void process_timing_reqs();
     Staff_walker(Staff_walker const&);
 };