lilypond-0.0.32

diff --git a/hdr/inputscore.hh b/hdr/inputscore.hh
index ef0d9d6a889f9763577cbe92dc093ae7555a1975..024c6d132c25d129780796c1ff4c6c1ff8c7837e 100644 (file)
--- a/hdr/inputscore.hh
+++ b/hdr/inputscore.hh
@@ -1,5 +1,15 @@
-#ifndef ISCORE_HH
-#define ISCORE_HH
+/*
+  inputscore.hh -- declare 
+
+  source file of the LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+
+#ifndef INPUTSCORE_HH
+#define INPUTSCORE_HH
+
 #include "varray.hh"
 #include "proto.hh"
 #include "plist.hh"
@@ -13,20 +23,22 @@ struct Input_score {
     int errorlevel_i_;
     
     /// paper_, staffs_ and commands_ form the problem definition.
-    Paperdef *paper_;
+    Paperdef *paper_p_;
     IPointerList<Input_staff*> staffs_;
-    IPointerList<Input_command*> commands_;
+
+    Input_music * score_wide_music_p_;
     
     /* *************************************************************** */
     Input_score();
     Input_score(Input_score const&);
-    void add(Array<Input_command*> &s);
+
     void add(Input_staff*);
     ~Input_score();
     /// construction
     void set(Paperdef*);
     void print() const;
     Score*parse();
+    void set(Input_music*);
 };
 
 #endif

diff --git a/hdr/inputstaff.hh b/hdr/inputstaff.hh
index cc9f823885b06a8c4fc26ef87737b5faaea47528..f72cac8ba1aa60f9c50b8fbbe0b6229f1fede1a9 100644 (file)
--- a/hdr/inputstaff.hh
+++ b/hdr/inputstaff.hh
@@ -1,5 +1,5 @@
 /*
-  inputstaff.hh -- part of LilyPond
+  inputstaff.hh -- declare Input_staff
 
   (c) 1996,97 Han-Wen Nienhuys
 */
@@ -14,19 +14,19 @@
 
 struct Input_staff {
     
-
     const char * defined_ch_c_l_;
     String type;
-    IPointerList<Input_command*> commands_;
+    
     IPointerList<Input_music*> music_;
-
+    Input_music * score_wide_music_p_;
+    
     /* *************** */
-
+    ~Input_staff();
     void add(Input_music*m);
     Input_staff(Input_staff const&);
     Input_staff(String);
-    void add(Array<Input_command*> &s);
-    Staff* parse(Score*);
+    void set_score_wide(Input_music*m);
+    Staff* parse(Score*, Input_music *score_wide);
     void print() const;
 };