Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / include / score.hh

diff --git a/lily/include/score.hh b/lily/include/score.hh
index 26fe6fb57f6178b2ca87eb67d5b126847f4f4cf9..004e251dd9c78a5b310f74e4563772156b2c5111 100644 (file)
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -3,39 +3,46 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 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 "protected-scm.hh"
-#include "parray.hh"
+
+#include "input.hh"
+#include "std-vector.hh"
 #include "smobs.hh"
+#include "virtual-methods.hh"
+#include "std-string.hh"
+
+class Score : public Input
+{
+  DECLARE_SMOBS (Score, foo);
 
-/// the total music def of one movement
-class Score: public Input {
-public:
-  /// paper_, staffs_ and commands_ form the problem definition.
-  Link_array<Music_output_def> def_p_arr_;
   SCM music_;
-  Scheme_hash_table * header_p_;
 
-  int errorlevel_i_;
-    
-  /// construction
-  Score();
-  Score (Score const&);
+public:
+  vector<Output_def*> defs_;
+  string user_key_;
+  SCM header_;
+  bool error_found_;
+
+  Score ();
+  Score (Score const &);
+
+  
+  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_p);
-  DECLARE_SMOBS(Score,foo);
-private:
-  void run_translator (Music_output_def*);
-};
-Score * unsmob_score (SCM); 
-#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 */