X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore.hh;h=7d4fa0142b96a08d2ee5000779f4ab42d1891e56;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=bc89e7ae8a8a127ebdb95195a6aaebf32829bf67;hpb=74e65211d6cda3818a6d4891f1f1c31f457e94cd;p=lilypond.git

diff --git a/lily/include/score.hh b/lily/include/score.hh
index bc89e7ae8a..7d4fa0142b 100644
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -3,40 +3,49 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef SCORE_HH
 #define SCORE_HH
 
-#include "array.hh"
 #include "lily-proto.hh"
-#include "string.hh"
+
 #include "input.hh"
-#include "lily-proto.hh"
-#include "parray.hh"
+#include "std-vector.hh"
+#include "smobs.hh"
+#include "virtual-methods.hh"
 
-/// the total music def of one movement
-class Score: public Input {
+class Score
+{
+  DECLARE_SMOBS (Score);
+
+  SCM music_;
+  SCM input_location_;
+  SCM header_;
 public:
-  /// paper_, staffs_ and commands_ form the problem definition.
-  Link_array<Music_output_def> def_p_arr_;
-  Music * music_p_;
-  Scope * header_p_;
-
-  int errorlevel_i_;
-    
-  /// construction
-  Score();
-  Score (Score const&);
-  ~Score();    
-
-  void process();
-  void add_output (Music_output_def *def_p);
-  void print() const;
-private:
-  void run_translator (Music_output_def*);
+  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 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);
 };
 
-#endif
+DECLARE_UNSMOB (Score, score);
+
+SCM ly_render_output (SCM, SCM);
+SCM ly_run_translator (SCM, SCM);
+
+#endif /* SCORE_HH */