* lily/include/main.hh: rename format to backend.

[lilypond.git] / lily / score.cc

diff --git a/lily/score.cc b/lily/score.cc
index b758fde169abea3cd2f27eed67e3493a84b3a16c..945b7c75e0b694df981d0759324f60c82b190dcf 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -80,7 +80,7 @@ Score::Score (Score const &s)
 
   smobify_self ();
 
-  Music *m =unsmob_music (s.music_);
+  Music *m = unsmob_music (s.music_);
   music_ = m ? m->clone ()->self_scm () : SCM_EOL;
   scm_gc_unprotect_object (music_);
   
@@ -252,6 +252,7 @@ Score::book_rendering (String outname,
 
   Object_key * key = new Lilypond_general_key (book_key, user_key_, 0);
   SCM scm_key = key->self_scm();
+  scm_gc_unprotect_object (scm_key);
   
   for (int i = 0; !i || i < outdef_count; i++)
     {
@@ -335,7 +336,7 @@ void
 Score::set_music (SCM music, SCM parser)
 {
   /* URG? */
-  SCM check_funcs = ly_scheme_function ("toplevel-music-functions");
+  SCM check_funcs = ly_lily_module_constant ("toplevel-music-functions");
   for (; scm_is_pair (check_funcs); check_funcs = scm_cdr (check_funcs))
     music = scm_call_2 (scm_car (check_funcs), music, parser);