partial: 0.0.38.hanjan

[lilypond.git] / hdr / inputscore.hh

diff --git a/hdr/inputscore.hh b/hdr/inputscore.hh
index 39e6a367fdce4f23f0db53067b17ca7b7e8cc74b..88cc1894a86f127ce74a1ea344b4f9987dadf744 100644 (file)
--- a/hdr/inputscore.hh
+++ b/hdr/inputscore.hh
@@ -1,29 +1,46 @@
-#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"
+#include "string.hh"
 
 
 /// the total music def of one movement
 struct Input_score {
+    /// defined where?    
+    const char* defined_ch_c_l_;
+    int errorlevel_i_;
+    
     /// paper_, staffs_ and commands_ form the problem definition.
-    Paperdef *paper_;
+    Paperdef *paper_p_;
+    Midi_def* midi_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 set(Midi_def* midi_p);
     void print() const;
     Score*parse();
+    void set(Input_music*);
 };
-/**
-        
-    */
+
 #endif