Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/include/score.hh b/lily/include/score.hh
index 092ddd0c8d9b3ae74abd2b5a838c176b049af481..71b2037efb6e8035fee2a906baf9b957ea26be2c 100644 (file)
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -15,23 +15,25 @@
 #include "std-vector.hh"
 #include "smobs.hh"
 #include "virtual-methods.hh"
-#include "std-string.hh"
 
-class Score : public Input
+class Score
 {
-  DECLARE_SMOBS (Score, foo);
+  DECLARE_SMOBS (Score);
 
   SCM music_;
-
+  SCM input_location_;
 public:
-  Link_array__Output_def_ defs_;
-  std::string user_key_;
+  Input *origin() const;
+ 
+  vector<Output_def*> defs_;
+  string user_key_;
   SCM header_;
   bool error_found_;
 
   Score ();
   Score (Score const &);
 
+  VIRTUAL_COPY_CONSTRUCTOR (Score, Score);
   
   SCM get_music () const;
   void add_output_def (Output_def *def);