Imported sources

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

diff --git a/lily/include/score.hh b/lily/include/score.hh
index b315574933032e378b2037c776e798b0fe139ad9..4a03be69322781d48901b7400b59f0f7a133fea4 100644 (file)
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -12,28 +12,26 @@
 
 #include "input.hh"
 #include "lily-proto.hh"
-#include "protected-scm.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_;
-  Protected_scm music_;
-  Scope * 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_output (Music_output_def *def_p);
+  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