* lily/book.cc:

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

diff --git a/lily/include/score.hh b/lily/include/score.hh
index e86b629a28ec5c02946e2d2b7337c7008a1d2599..bb879e9841dd7c6b4dc885f24643100889ebb9e7 100644 (file)
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -3,41 +3,46 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
 #ifndef SCORE_HH
 #define SCORE_HH
 
-#include "array.hh"
 #include "lily-proto.hh"
-#include "plist.hh"
-#include "string.hh"
+
 #include "input.hh"
-#include "lily-proto.hh"
 #include "parray.hh"
+#include "smobs.hh"
+#include "virtual-methods.hh"
+#include "string.hh"
+
+class Score : public Input
+{
+  DECLARE_SMOBS (Score, foo);
+
+  SCM music_;
 
-/// 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_;
-
-  int errorlevel_i_;
-    
-  /// construction
-  Score();
+  String user_key_;
+  Link_array<Output_def> defs_;
+  SCM header_;
+  SCM texts_;
+  bool error_found_;
+  
+  Score ();
   Score (Score const&);
-  ~Score();    
 
-  void process();
-  void add_output (Music_output_def *def_p);
-  void print() const;
-private:
-  void run_translator (Music_output_def*);
+  SCM get_music () const;
+  void set_music (SCM music, SCM parser);
+  SCM book_rendering (String, Output_def*, Output_def*, Object_key*);
 };
 
-#endif
+DECLARE_UNSMOB (Score, score);
+
+void default_rendering (SCM, SCM, SCM, SCM, SCM, SCM);
+SCM ly_music_scorify (SCM, SCM);
+SCM ly_render_output (SCM, SCM);
+SCM ly_run_translator (SCM, SCM, SCM);
+
+#endif /* SCORE_HH */