``slikken kreng''

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

diff --git a/lily/include/score.hh b/lily/include/score.hh
index a496159b10b7359d52af3dc8cf82efe6c7c6dd78..ff0a311243157aa952729c6a00967586389d5e5a 100644 (file)
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -3,40 +3,39 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef SCORE_HH
 #define SCORE_HH
 
-#include "array.hh"
-#include "lily-proto.hh"
-#include "string.hh"
 #include "input.hh"
 #include "lily-proto.hh"
+
 #include "parray.hh"
+#include "smobs.hh"
 
 /// the total music def of one movement
 class Score: public Input {
 public:
-  /// paper_, staffs_ and commands_ form the problem definition.
-  Link_array<Music_output_def> def_p_arr_;
-  Music * music_p_;
-  Scope * header_p_;
+  /// paper_, staves_ and commands_ form the problem definition.
+  Link_array<Music_output_def> defs_;
+  SCM music_;
+  Scheme_hash_table * header_;
 
-  int errorlevel_i_;
+  int errorlevel_;
     
   /// construction
-  Score();
+  Score ();
   Score (Score const&);
-  ~Score();    
 
-  void process();
-  void add_output (Music_output_def *def_p);
-  void print() const;
+
+  void process ();
+  void add_output (Music_output_def *def);
+  DECLARE_SMOBS (Score,foo);
 private:
   void run_translator (Music_output_def*);
 };
-
+DECLARE_UNSMOB(Score,score); 
 #endif