X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore.hh;h=bcd967cda108991715b6bb21b6ad8a6aec0b0860;hb=9ec9ed150f9f9841d058afb3e30746fc1b89b954;hp=092ddd0c8d9b3ae74abd2b5a838c176b049af481;hpb=9d4a5bbc9687aef811a60aabd9cb839412984e96;p=lilypond.git

diff --git a/lily/include/score.hh b/lily/include/score.hh
index 092ddd0c8d..bcd967cda1 100644
--- 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);
@@ -41,7 +43,6 @@ public:
 
 DECLARE_UNSMOB (Score, score);
 
-void default_rendering (SCM, SCM, SCM, SCM, SCM, SCM);
 SCM ly_render_output (SCM, SCM);
 SCM ly_run_translator (SCM, SCM, SCM);