* Documentation/topdocs/NEWS.tely (Top): Mention markup text feature.

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

diff --git a/lily/include/score.hh b/lily/include/score.hh
index c401c57f73e8387f5640d1619ecf83322cf4904d..fac59eee38d43ee6ea0345e6d060d112f0cad07d 100644 (file)
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -3,40 +3,44 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 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
+{
+  DECLARE_SMOBS (Score, foo);
 
-/// 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_;
-  Input_file_settings* input_file_;
+public:
+  String user_key_;
+  Link_array<Output_def> defs_;
+  SCM header_;
+  SCM texts_;
+  bool error_found_;
   
-  int errorlevel_;
-    
-  /// construction
+  SCM get_music () const;
+  void set_music (SCM music, SCM parser);
   Score ();
   Score (Score const&);
+  
+  SCM book_rendering (String, 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
+SCM ly_run_translator (SCM, SCM, SCM);
+SCM ly_render_output (SCM, SCM);
+void default_rendering (SCM, SCM, SCM, SCM, SCM, SCM, SCM);
+
+#endif /* SCORE_HH */