From 4ea712644655bb8cc0b05a4353b9c63f75d5cd5d Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 19:26:53 +0000
Subject: [PATCH] lilypond-0.0.19

---
 hdr/inputcommands.hh | 16 +++++-----------
 hdr/proto.hh         |  4 ++++
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/hdr/inputcommands.hh b/hdr/inputcommands.hh
index c5b594359b..527986e6ea 100644
--- 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 09465e3e85..217b2f7f58 100644
--- 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
-- 
2.39.5