Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/include/score.hh b/lily/include/score.hh
index 2c9858948ece57d82bbe644476d8a93b9d6f74a9..004e251dd9c78a5b310f74e4563772156b2c5111 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
@@ -12,27 +12,37 @@
 #include "lily-proto.hh"
 
 #include "input.hh"
-#include "parray.hh"
+#include "std-vector.hh"
 #include "smobs.hh"
 #include "virtual-methods.hh"
+#include "std-string.hh"
 
 class Score : public Input
 {
   DECLARE_SMOBS (Score, foo);
 
-public:
-  Link_array<Music_output_def> defs_;
   SCM music_;
+
+public:
+  vector<Output_def*> defs_;
+  string user_key_;
   SCM header_;
-    
+  bool error_found_;
+
   Score ();
-  Score (Score const&);
-  SCM book_rendering (String, Music_output_def*, Paper_def**);
+  Score (Score const &);
+
+  
+  SCM get_music () const;
+  void add_output_def (Output_def *def);
+  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 ly_run_translator (SCM, SCM, SCM);
 
 #endif /* SCORE_HH */