* The grand 2005-2006 replace.

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

diff --git a/lily/include/score.hh b/lily/include/score.hh
index d9a81f79e8c549306d8a21e34321a421899b13ec..4af2d552e91d3a8dbf18eb9e0381ba0d4eac8991 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SCORE_HH
@@ -15,25 +15,32 @@
 #include "parray.hh"
 #include "smobs.hh"
 #include "virtual-methods.hh"
+#include "string.hh"
 
 class Score : public Input
 {
   DECLARE_SMOBS (Score, foo);
 
+  SCM music_;
+
 public:
+  String user_key_;
   Link_array<Output_def> defs_;
-  SCM music_;
   SCM header_;
-    
+  bool error_found_;
+
   Score ();
-  Score (Score const&);
-  SCM book_rendering (String, Book_output_def*, Output_def*, Output_def**);
+  Score (Score const &);
+
+  SCM get_music () const;
+  void set_music (SCM music);
+  SCM book_rendering (Output_def *, Output_def *, Object_key *);
 };
 
 DECLARE_UNSMOB (Score, score);
 
-SCM ly_run_translator (SCM, SCM);
+void default_rendering (SCM, SCM, SCM, SCM, SCM, SCM);
 SCM ly_render_output (SCM, SCM);
-void default_rendering (SCM, SCM, SCM, SCM, SCM);
+SCM ly_run_translator (SCM, SCM, SCM);
 
 #endif /* SCORE_HH */