X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore.hh;h=ab6fcca3b5c112fe9c846f941c3e953f59d08fa4;hb=789d65a45b89c1fe7ec8ee4e80cca8a687274ea7;hp=bb879e9841dd7c6b4dc885f24643100889ebb9e7;hpb=26bb48ca73e9b8f4c0aeca0427eff8b7520b0731;p=lilypond.git

diff --git a/lily/include/score.hh b/lily/include/score.hh
index bb879e9841..ab6fcca3b5 100644
--- 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--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SCORE_HH
@@ -12,37 +12,40 @@
 #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_;
-
-public:
-  String user_key_;
-  Link_array<Output_def> defs_;
+  SCM input_location_;
   SCM header_;
-  SCM texts_;
+public:
+  Input *origin() const;
+ 
+  vector<Output_def*> defs_;
+  string user_key_;
   bool error_found_;
-  
+
   Score ();
-  Score (Score const&);
+  Score (Score const &);
 
+  VIRTUAL_COPY_CONSTRUCTOR (Score, Score);
+  
   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 *);
+  SCM get_header () const;
+  void set_header (SCM module);
 };
 
 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);
+SCM ly_run_translator (SCM, SCM);
 
 #endif /* SCORE_HH */