* Another grand 2003 update.

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

diff --git a/lily/include/score.hh b/lily/include/score.hh
index ab48fd3c97ae70f38e94c2a10a0493d0cfb3dbeb..38e7d8b9345168533e3ce57cbe50233c83af84e1 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -12,30 +12,31 @@
 
 #include "input.hh"
 #include "lily-proto.hh"
-#include "protected-scm.hh"
+
 #include "parray.hh"
 #include "smobs.hh"
 
 /// 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_;
+  /// paper_, staves_ and commands_ form the problem definition.
+  Link_array<Music_output_def> defs_;
   SCM music_;
-  Scheme_hash_table * header_p_;
-
-  int errorlevel_i_;
+  SCM header_;
+  Input_file_results* input_file_;
+  
+  int errorlevel_;
     
   /// construction
-  Score();
+  Score ();
   Score (Score const&);
 
 
-  void process();
-  void add_output (Music_output_def *def_p);
-  DECLARE_SMOBS(Score,foo);
+  void process ();
+  void add_output (Music_output_def *def);
+  DECLARE_SMOBS (Score,foo);
 private:
   void run_translator (Music_output_def*);
 };
-Score * unsmob_score (SCM); 
+DECLARE_UNSMOB(Score,score); 
 #endif