X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore.hh;h=d1659a06227382b9d356861652d5ce766d3968d8;hb=eee5583d9b8b6ff3187060aa48120e4544d2af58;hp=7d4fa0142b96a08d2ee5000779f4ab42d1891e56;hpb=0387f04497978e37b335a8b99eec905499d6ad0f;p=lilypond.git

diff --git a/lily/include/score.hh b/lily/include/score.hh
index 7d4fa0142b..d1659a0622 100644
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -1,9 +1,20 @@
 /*
-  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--2008 Han-Wen Nienhuys <hanwen@xs4all.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
@@ -16,25 +27,27 @@
 #include "smobs.hh"
 #include "virtual-methods.hh"
 
-class Score
+class Score : public Smob<Score>
 {
-  DECLARE_SMOBS (Score);
-
+public:
+  SCM mark_smob () const;
+  static const char type_p_name_[];
+  virtual ~Score ();
+private:
   SCM music_;
   SCM input_location_;
   SCM header_;
 public:
-  Input *origin() const;
- 
-  vector<Output_def*> defs_;
-  string user_key_;
+  Input *origin () const;
+
+  std::vector<Output_def *> defs_;
   bool error_found_;
 
   Score ();
   Score (Score const &);
 
   VIRTUAL_COPY_CONSTRUCTOR (Score, Score);
-  
+
   SCM get_music () const;
   void add_output_def (Output_def *def);
   void set_music (SCM music);
@@ -43,9 +56,7 @@ public:
   void set_header (SCM module);
 };
 
-DECLARE_UNSMOB (Score, score);
 
-SCM ly_render_output (SCM, SCM);
 SCM ly_run_translator (SCM, SCM);
 
 #endif /* SCORE_HH */