X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore.hh;h=4f1933c8b537efc504b1bcd44b5a00b9ed17d062;hb=4f0fd7c93429fb5641f759caf65dc8687c7af4e2;hp=ed6aecddd27ffe4f3e7cdc55c704fe0a84418494;hpb=813ef8712c3026794399ff1425a245ffe075efaf;p=lilypond.git

diff --git a/lily/include/score.hh b/lily/include/score.hh
index ed6aecddd2..4f1933c8b5 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--2007 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 &);
 
+  VIRTUAL_COPY_CONSTRUCTOR (Score, Score);
+  
   SCM get_music () const;
-  void set_music (SCM music, SCM parser);
-  SCM book_rendering (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 */