release commit

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

diff --git a/lily/include/score.hh b/lily/include/score.hh
index 7c25235490258d8fa77ca63e2800351c51668be7..0f015a0139fbba775cc9b5ee863869b8817b9cc7 100644 (file)
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -3,39 +3,37 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
 #ifndef SCORE_HH
 #define SCORE_HH
 
-#include "input.hh"
 #include "lily-proto.hh"
-#include "protected-scm.hh"
+
+#include "input.hh"
 #include "parray.hh"
 #include "smobs.hh"
+#include "virtual-methods.hh"
+
+class Score : public Input
+{
+  DECLARE_SMOBS (Score, foo);
 
-/// 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_;
+  Link_array<Output_def> defs_;
   SCM music_;
-  Scheme_hash_table * header_p_;
-
-  int errorlevel_i_;
+  SCM header_;
     
-  /// construction
   Score ();
   Score (Score const&);
+  SCM book_rendering (String, Output_def*, Output_def*);
+};
 
+DECLARE_UNSMOB (Score, score);
 
-  void process ();
-  void add_output (Music_output_def *def_p);
-  DECLARE_SMOBS (Score,foo);
-private:
-  void run_translator (Music_output_def*);
-};
-Score * unsmob_score (SCM); 
-#endif
+SCM ly_run_translator (SCM, SCM);
+SCM ly_render_output (SCM, SCM);
+void default_rendering (SCM, SCM, SCM, SCM, SCM);
+
+#endif /* SCORE_HH */