trim duplicate headers.

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

diff --git a/lily/include/score.hh b/lily/include/score.hh
index b0325337864a1209b5ad247495dde6e298d1a6e2..71b2037efb6e8035fee2a906baf9b957ea26be2c 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@xs4all.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SCORE_HH
@@ -12,28 +12,31 @@
 #include "lily-proto.hh"
 
 #include "input.hh"
-#include "parray.hh"
+#include "std-vector.hh"
 #include "smobs.hh"
 #include "virtual-methods.hh"
-#include "string.hh"
 
-class Score : public Input
+class Score
 {
-  DECLARE_SMOBS (Score, foo);
+  DECLARE_SMOBS (Score);
 
   SCM music_;
-
+  SCM input_location_;
 public:
-  String user_key_;
-  Link_array<Output_def> defs_;
+  Input *origin() const;
+ 
+  vector<Output_def*> defs_;
+  string user_key_;
   SCM header_;
-  SCM texts_;
   bool error_found_;
 
   Score ();
   Score (Score const &);
 
+  VIRTUAL_COPY_CONSTRUCTOR (Score, Score);
+  
   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 *);
 };