lilypond-0.0.19

diff --git a/hdr/inputcommands.hh b/hdr/inputcommands.hh
index c5b594359bae015a45fe7c1026940e7050077f41..527986e6ea626864ef870220f4c9c2e0fd39eebf 100644 (file)
--- a/hdr/inputcommands.hh
+++ b/hdr/inputcommands.hh
@@ -11,21 +11,15 @@
 #include "proto.hh"
 #include "plist.hh"
 #include "real.hh"
+#include "moment.hh"
 
 struct Commands_at : public IPointerList<Input_command*> {
-    Real when;
-
-    /// current measure info
-    Real whole_per_measure;
-
-    /// where am i 
-    Real whole_in_measure;
-    
-    /// idem
+    Moment moment_;
     
-    int bars;
-
     /****************/
+
+    Real when();
+    void     parse(Staff_commands_at*);
     void print() const;
     Real barleft();
     void add(Input_command*);

diff --git a/hdr/proto.hh b/hdr/proto.hh
index 09465e3e85adb5fd4439b5ede0c95194e0a2bc86..217b2f7f588dfc928817b5174e0cc2907968228e 100644 (file)
--- a/hdr/proto.hh
+++ b/hdr/proto.hh
@@ -92,4 +92,8 @@ struct Input_command;
 struct Notename_tab;
 struct Input_file;
 struct Keyword_table;
+struct Rhythmic_grouping;
+struct Staff_commands_at ;
+struct Commands_at ;
+struct Moment;
 #endif // PROTO_HH