X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore.hh;h=0baf198fa325ce2b9076442642fe1d4338d4afb5;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=af1e3caccb568fe4933437d91aa708828d55f40b;hpb=5c2afd9ecbe4d91998a325f6323f05ea4d658d96;p=lilypond.git

diff --git a/lily/include/score.hh b/lily/include/score.hh
index af1e3caccb..0baf198fa3 100644
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -1,41 +1,62 @@
 /*
-  score.hh -- declare Score
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #ifndef SCORE_HH
 #define SCORE_HH
 
-#include "input.hh"
 #include "lily-proto.hh"
-#include "protected-scm.hh"
-#include "parray.hh"
+
+#include "input.hh"
+#include "std-vector.hh"
 #include "smobs.hh"
+#include "virtual-methods.hh"
 
-/// the total music def of one movement
-class Score: public Input {
+class Score : public Smob<Score>
+{
 public:
-  /// paper_, staves_ and commands_ form the problem definition.
-  Link_array<Music_output_def> def_p_arr_;
+  SCM mark_smob ();
+  static const char type_p_name_[];
+  virtual ~Score ();
+private:
   SCM music_;
-  Scheme_hash_table * header_p_;
+  SCM input_location_;
+  SCM header_;
+public:
+  Input *origin () const;
+
+  vector<Output_def *> defs_;
+  bool error_found_;
 
-  int errorlevel_i_;
-    
-  /// construction
   Score ();
-  Score (Score const&);
+  Score (Score const &);
 
+  VIRTUAL_COPY_CONSTRUCTOR (Score, Score);
 
-  void process ();
-  void add_output (Music_output_def *def_p);
-  DECLARE_SMOBS (Score,foo);
-private:
-  void run_translator (Music_output_def*);
+  SCM get_music () const;
+  void add_output_def (Output_def *def);
+  void set_music (SCM music);
+  SCM book_rendering (Output_def *, Output_def *);
+  SCM get_header () const;
+  void set_header (SCM module);
 };
-DECLARE_UNSMOB(Score,score); 
-#endif
+
+
+SCM ly_run_translator (SCM, SCM);
+
+#endif /* SCORE_HH */