X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore.hh;h=bcd967cda108991715b6bb21b6ad8a6aec0b0860;hb=955f7d961f7cca354a4c5d0bc6f36d157149f7e9;hp=2c9858948ece57d82bbe644476d8a93b9d6f74a9;hpb=58285d9a44003dc28d5183daa5c1ae71249440e5;p=lilypond.git

diff --git a/lily/include/score.hh b/lily/include/score.hh
index 2c9858948e..bcd967cda1 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SCORE_HH
@@ -12,27 +12,38 @@
 #include "lily-proto.hh"
 
 #include "input.hh"
-#include "parray.hh"
+#include "std-vector.hh"
 #include "smobs.hh"
 #include "virtual-methods.hh"
 
-class Score : public Input
+class Score
 {
-  DECLARE_SMOBS (Score, foo);
+  DECLARE_SMOBS (Score);
 
-public:
-  Link_array<Music_output_def> defs_;
   SCM music_;
+  SCM input_location_;
+public:
+  Input *origin() const;
+ 
+  vector<Output_def*> defs_;
+  string user_key_;
   SCM header_;
-    
+  bool error_found_;
+
   Score ();
-  Score (Score const&);
-  SCM book_rendering (String, Music_output_def*, Paper_def**);
+  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 *);
 };
+
 DECLARE_UNSMOB (Score, score);
 
-SCM ly_run_translator (SCM, SCM);
 SCM ly_render_output (SCM, SCM);
-void default_rendering (SCM, SCM, SCM, SCM);
+SCM ly_run_translator (SCM, SCM, SCM);
 
 #endif /* SCORE_HH */