* flower/include/axis.hh: rename from axes.hh

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

diff --git a/lily/include/score.hh b/lily/include/score.hh
index 8a50481cc3f00fef1496015864daf288a5657380..ed6aecddd27ffe4f3e7cdc55c704fe0a84418494 100644 (file)
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -3,35 +3,46 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
 #ifndef SCORE_HH
 #define SCORE_HH
 
-#include "input.hh"
 #include "lily-proto.hh"
 
+#include "input.hh"
 #include "parray.hh"
 #include "smobs.hh"
+#include "virtual-methods.hh"
+#include "string.hh"
 
 class Score : public Input
 {
-public:
-  Link_array<Music_output_def> defs_;
+  DECLARE_SMOBS (Score, foo);
+
   SCM music_;
+
+public:
+  String user_key_;
+  Link_array<Output_def> defs_;
   SCM header_;
-    
+  SCM texts_;
+  bool error_found_;
+
   Score ();
-  Score (Score const&);
-  DECLARE_SMOBS (Score,foo);
-private:
+  Score (Score const &);
+
+  SCM get_music () const;
+  void set_music (SCM music, SCM parser);
+  SCM book_rendering (Output_def *, Output_def *, Object_key *);
 };
-DECLARE_UNSMOB(Score,score); 
 
+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);
-SCM ly_render_output (SCM, SCM, SCM);
-void default_rendering (SCM,SCM,SCM,SCM);
-#endif
+#endif /* SCORE_HH */