X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=84f236864d4b07869eb6aa024c03424a155dab6d;hb=25be0aa5e4481df77568b99357764f5b1ff46ceb;hp=63169ca4620dbb8da7dc7b03ad55f1cbc8694543;hpb=af770f3440264c18ce01525dce1aa76b86ace0d5;p=lilypond.git

diff --git a/lily/score.cc b/lily/score.cc
index 63169ca462..84f236864d 100644
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -1,9 +1,20 @@
 /*
-  score.cc -- implement Score
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 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/>.
 */
 
 #include "score.hh"
@@ -17,7 +28,6 @@ using namespace std;
 #include "global-context.hh"
 #include "international.hh"
 #include "lily-parser.hh"
-#include "lilypond-key.hh"
 #include "main.hh"
 #include "music.hh"
 #include "music.hh"
@@ -34,7 +44,6 @@ Score::origin () const
   return unsmob_input (input_location_);
 }
 
-
 Score::Score ()
 {
   header_ = SCM_EOL;
@@ -69,7 +78,7 @@ Score::mark_smob (SCM s)
 }
 
 int
-Score::print_smob (SCM, SCM p, scm_print_state*)
+Score::print_smob (SCM, SCM p, scm_print_state *)
 {
   scm_puts ("#<Score>", p);
 
@@ -84,7 +93,7 @@ Score::Score (Score const &s)
   error_found_ = s.error_found_;
 
   smobify_self ();
-  input_location_ = make_input (*s.origin ()); 
+  input_location_ = make_input (*s.origin ());
 
   Music *m = unsmob_music (s.music_);
   if (m)
@@ -101,12 +110,11 @@ Score::Score (Score const &s)
       defs_.push_back (copy);
       copy->unprotect ();
     }
-  header_ = ly_make_anonymous_module (false);
+  header_ = ly_make_module (false);
   if (ly_is_module (s.header_))
     ly_module_copy (header_, s.header_);
 }
 
-
 /*
   Format score, return list of Music_output objects.
 
@@ -114,8 +122,7 @@ Score::Score (Score const &s)
 */
 SCM
 Score::book_rendering (Output_def *layoutbook,
-		       Output_def *default_def,
-		       Object_key *book_key)
+                       Output_def *default_def)
 {
   if (error_found_)
     return SCM_EOL;
@@ -131,36 +138,32 @@ Score::book_rendering (Output_def *layoutbook,
 
   int outdef_count = defs_.size ();
 
-  Object_key *key = new Lilypond_general_key (book_key, user_key_, 0);
-  SCM scm_key = key->unprotect ();
-
   for (int i = 0; !i || i < outdef_count; i++)
     {
       Output_def *def = outdef_count ? defs_[i] : default_def;
       SCM scaled = SCM_EOL;
 
       if (def->c_variable ("is-layout") == SCM_BOOL_T)
-	{
-	  def = scale_output_def (def, scale);
-	  def->parent_ = layoutbook;
+        {
+          def = scale_output_def (def, scale);
+          def->parent_ = layoutbook;
 
-	  scaled = def->unprotect ();
-	}
+          scaled = def->unprotect ();
+        }
 
       /* TODO: fix or junk --no-layout.  */
-      SCM context = ly_run_translator (music_, def->self_scm (), scm_key);
+      SCM context = ly_run_translator (music_, def->self_scm ());
       if (dynamic_cast<Global_context *> (unsmob_context (context)))
-	{
-	  SCM s = ly_format_output (context);
+        {
+          SCM s = ly_format_output (context);
 
-	  *tail = scm_cons (s, SCM_EOL);
-	  tail = SCM_CDRLOC (*tail);
-	}
+          *tail = scm_cons (s, SCM_EOL);
+          tail = SCM_CDRLOC (*tail);
+        }
 
       scm_remember_upto_here_1 (scaled);
     }
 
-  scm_remember_upto_here_1 (scm_key);
   scm_remember_upto_here_1 (scaled_bookdef);
   return outputs;
 }
@@ -179,7 +182,7 @@ Score::set_music (SCM music)
       m->origin ()->error (_ ("errors found, ignoring music expression"));
 
       this->error_found_ = this->error_found_
-	|| to_boolean (m->get_property ("error-found"));
+                           || to_boolean (m->get_property ("error-found"));
     }
 
   if (this->error_found_)
@@ -199,3 +202,16 @@ Score::add_output_def (Output_def *def)
 {
   defs_.push_back (def);
 }
+
+SCM
+Score::get_header () const
+{
+  return header_;
+}
+
+void
+Score::set_header (SCM module)
+{
+  assert (ly_is_module (module));
+  header_ = module;
+}