lilypond-0.0.5

diff --git a/scommands.hh b/scommands.hh
index 15c844ca65aa776f47ecd81d9310769202912100..ee3b4591ab1e03407fc116c87fb22458da8e7cc8 100644 (file)
--- a/scommands.hh
+++ b/scommands.hh
@@ -9,8 +9,10 @@
 #include "vray.hh"
 #include "list.hh"
 
-struct Score_commands : public      PointerList<Command*> {
-    void add(Command);
+struct Score_commands : public PointerList<Command*> {
+    void process_add(Command);
+    Score_commands*parse(Real last)const;
+    void parser_add(Command*);
     void add_seq(svec<Command>);
     void clean(Real last);
     void set_breakable(Real when);
@@ -20,6 +22,9 @@ struct Score_commands : public      PointerList<Command*> {
     void add_command_to_break(Command pre, Command mid,Command post);
     void OK() const;
     void print() const;
+    Real last() const;
+    void insert_between(Command victim, PCursor<Command*> firstc,
+                       PCursor<Command*> last);
 };
 /** the list of commands in Score. Put in a separate class, since it
   otherwise clutters the methods of Score.  */

diff --git a/score.hh b/score.hh
index c6af97c7a10d77fb395fe086961ca9f2fd07292e..e58f87f0581ff3db8f6103692c6564332c19df45 100644 (file)
--- a/score.hh
+++ b/score.hh
@@ -1,16 +1,16 @@
 #ifndef SCORE_HH
 #define SCORE_HH
-
 #include "vray.hh"
-#include "mtime.hh"
-#include "scommands.hh"
+#include "proto.hh"
+#include "list.hh"
+
 
 /// the total music def of one movement
 struct Score {
-    Paperdef *paper;
-    /// staffs_ and commands_ form the problem definition.
+    /// paper_, staffs_ and commands_ form the problem definition.
+    Paperdef *paper_;
     PointerList<Staff *> staffs_;
-    Score_commands commands_;
+    Score_commands *commands_;
     
     /// "runtime" fields for setting up spacing    
     PointerList<Score_column*> cols_;
@@ -18,27 +18,25 @@ struct Score {
 
     /****************************************************************/
 
-    Score();    
-    void process();
-
     /// construction
     void add_staff(Staff *st);
+    void set(Paperdef*);
+    Score();
+    ~Score();    
+    void add(Staff*);        
+    void set(Score_commands*);
 
-    void OK() const;
-    Score_column *find_col(Mtime,bool);
-    void do_pcols();
 
-    void add(Staff*);
+    void OK() const;
+    Score_column *find_col(Real,bool);
+    void process();
     void output(String fn);
-    PCursor<Score_column*> create_cols(Mtime);
+    PCursor<Score_column*> create_cols(Real);
     void print() const;
-
-    Mtime last() const;
-    
-    void add(Command*);
+    Real last() const;
     
 private:
-    
+    void do_pcols();    
     void clean_cols();
     void distribute_commands();
     void do_connect(PCol *c1, PCol *c2, Real d);