Fix error message output containing wide chars

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

diff --git a/lily/include/score.hh b/lily/include/score.hh
index 039e1d236a300b299c3ac4011d647def43fd453b..ab6fcca3b5c112fe9c846f941c3e953f59d08fa4 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SCORE_HH
@@ -15,7 +15,6 @@
 #include "std-vector.hh"
 #include "smobs.hh"
 #include "virtual-methods.hh"
-#include "std-string.hh"
 
 class Score
 {
@@ -23,12 +22,12 @@ class Score
 
   SCM music_;
   SCM input_location_;
+  SCM header_;
 public:
   Input *origin() const;
  
   vector<Output_def*> defs_;
   string user_key_;
-  SCM header_;
   bool error_found_;
 
   Score ();
@@ -39,13 +38,14 @@ public:
   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 *);
+  SCM book_rendering (Output_def *, Output_def *);
+  SCM get_header () const;
+  void set_header (SCM module);
 };
 
 DECLARE_UNSMOB (Score, score);
 
-void default_rendering (SCM, SCM, SCM, SCM, SCM, SCM);
 SCM ly_render_output (SCM, SCM);
-SCM ly_run_translator (SCM, SCM, SCM);
+SCM ly_run_translator (SCM, SCM);
 
 #endif /* SCORE_HH */