release: 0.0.65

[lilypond.git] / lily / include / score.hh

diff --git a/lily/include/score.hh b/lily/include/score.hh
index 293801a98e499420e0a3348bc6e046fa188159b4..364146883750a5042a82e3e6b83cf57f0cc4600b 100644 (file)
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -1,7 +1,7 @@
 /*
   score.hh -- declare Score
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
@@ -11,24 +11,28 @@
 #define SCORE_HH
 
 #include "varray.hh"
-#include "proto.hh"
+#include "lily-proto.hh"
 #include "plist.hh"
 #include "moment.hh"
 #include "assoc.hh"
 #include "string.hh"
+#include "input.hh"
+#include "lily-proto.hh"
 
 /// the total music def of one movement
 struct Score {
     /// paper_, staffs_ and commands_ form the problem definition.
     Paper_def *paper_p_;
     Midi_def *midi_p_;
-    IPointerList<Staff*> staffs_;
+    Pointer_list<Staff*> staffs_;
     
     /// "runtime" fields for setting up spacing    
-    IPointerList<Score_column*> cols_;
+    Pointer_list<Request_column*> rcols_;
+    
+    Pointer_list<Score_column*> cols_;
     PScore *pscore_p_;
 
-    char const *defined_ch_C_;
+    Input input_;
     int errorlevel_i_;
     
     /* *************************************************************** */
@@ -71,7 +75,7 @@ private:
     void paper();
 
     // utils:
-    PCursor<Score_column*> create_cols(Moment);
+    PCursor<Score_column*> create_cols(Moment, PCursor<Score_column*> &last);
 
     Score(Score const&){}