X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore.hh;h=039e1d236a300b299c3ac4011d647def43fd453b;hb=358d6e99ada8019268ade9ba9080b2d0d88eeb7a;hp=ff0a311243157aa952729c6a00967586389d5e5a;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git

diff --git a/lily/include/score.hh b/lily/include/score.hh
index ff0a311243..039e1d236a 100644
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -3,39 +3,49 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef SCORE_HH
 #define SCORE_HH
 
-#include "input.hh"
 #include "lily-proto.hh"
 
-#include "parray.hh"
+#include "input.hh"
+#include "std-vector.hh"
 #include "smobs.hh"
+#include "virtual-methods.hh"
+#include "std-string.hh"
+
+class Score
+{
+  DECLARE_SMOBS (Score);
 
-/// the total music def of one movement
-class Score: public Input {
-public:
-  /// paper_, staves_ and commands_ form the problem definition.
-  Link_array<Music_output_def> defs_;
   SCM music_;
-  Scheme_hash_table * header_;
+  SCM input_location_;
+public:
+  Input *origin() const;
+ 
+  vector<Output_def*> defs_;
+  string user_key_;
+  SCM header_;
+  bool error_found_;
 
-  int errorlevel_;
-    
-  /// construction
   Score ();
-  Score (Score const&);
+  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);
 
-  void process ();
-  void add_output (Music_output_def *def);
-  DECLARE_SMOBS (Score,foo);
-private:
-  void run_translator (Music_output_def*);
-};
-DECLARE_UNSMOB(Score,score); 
-#endif
+void default_rendering (SCM, SCM, SCM, SCM, SCM, SCM);
+SCM ly_render_output (SCM, SCM);
+SCM ly_run_translator (SCM, SCM, SCM);
+
+#endif /* SCORE_HH */