* 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 2c9858948ece57d82bbe644476d8a93b9d6f74a9..fac59eee38d43ee6ea0345e6d060d112f0cad07d 100644 (file)
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef SCORE_HH
@@ -15,24 +15,32 @@
 #include "parray.hh"
 #include "smobs.hh"
 #include "virtual-methods.hh"
+#include "string.hh"
 
 class Score : public Input
 {
   DECLARE_SMOBS (Score, foo);
 
-public:
-  Link_array<Music_output_def> defs_;
   SCM music_;
+public:
+  String user_key_;
+  Link_array<Output_def> defs_;
   SCM header_;
-    
+  SCM texts_;
+  bool error_found_;
+  
+  SCM get_music () const;
+  void set_music (SCM music, SCM parser);
   Score ();
   Score (Score const&);
-  SCM book_rendering (String, Music_output_def*, Paper_def**);
+  
+  SCM book_rendering (String, Output_def*, Output_def*, Object_key*);
 };
+
 DECLARE_UNSMOB (Score, score);
 
-SCM ly_run_translator (SCM, SCM);
+SCM ly_run_translator (SCM, SCM, SCM);
 SCM ly_render_output (SCM, SCM);
-void default_rendering (SCM, SCM, SCM, SCM);
+void default_rendering (SCM, SCM, SCM, SCM, SCM, SCM, SCM);
 
 #endif /* SCORE_HH */