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 bb879e9841dd7c6b4dc885f24643100889ebb9e7..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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SCORE_HH
@@ -12,10 +12,10 @@
 #include "lily-proto.hh"
 
 #include "input.hh"
-#include "parray.hh"
+#include "std-vector.hh"
 #include "smobs.hh"
 #include "virtual-methods.hh"
-#include "string.hh"
+#include "std-string.hh"
 
 class Score : public Input
 {
@@ -24,24 +24,24 @@ class Score : public Input
   SCM music_;
 
 public:
-  String user_key_;
-  Link_array<Output_def> defs_;
+  vector<Output_def*> defs_;
+  string user_key_;
   SCM header_;
-  SCM texts_;
   bool error_found_;
-  
+
   Score ();
-  Score (Score const&);
+  Score (Score const &);
 
+  
   SCM get_music () const;
-  void set_music (SCM music, SCM parser);
-  SCM book_rendering (String, Output_def*, Output_def*, Object_key*);
+  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);
 
 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);