X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore.hh;h=4a03be69322781d48901b7400b59f0f7a133fea4;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=667e44340229c84b99e3110ded8b587e93c92198;hpb=69b9cead5afe7164b9053d26eba582fec3825ef8;p=lilypond.git

diff --git a/lily/include/score.hh b/lily/include/score.hh
index 667e443402..4a03be6932 100644
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -3,41 +3,35 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef SCORE_HH
 #define SCORE_HH
 
-#include "varray.hh"
-#include "lily-proto.hh"
-#include "plist.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 {
+class Score : public Input
+{
 public:
-  /// paper_, staffs_ and commands_ form the problem definition.
-  Link_array<Music_output_def> def_p_arr_;
-  Music * music_p_;
-  Header * header_p_;
-
-  int errorlevel_i_;
+  Link_array<Music_output_def> defs_;
+  SCM music_;
+  SCM header_;
     
-  /// construction
-  Score();
+  Score ();
   Score (Score const&);
-  ~Score();    
-
-  void process();
-  void add (Music_output_def *def_p);
-  void print() const;
+  DECLARE_SMOBS (Score,foo);
 private:
-  void run_translator (Music_output_def*);
 };
+DECLARE_UNSMOB(Score,score); 
+
 
+SCM ly_run_translator (SCM, SCM);
+SCM ly_render_output (SCM, SCM, SCM);
+void default_rendering (SCM,SCM,SCM,SCM);
 #endif