* The grand 2005-2006 replace.

[lilypond.git] / lily / score-scheme.cc

diff --git a/lily/score-scheme.cc b/lily/score-scheme.cc
index 6ef6d216ecea404f422a7e92a66e5838d3b12371..dc33d44e649a18e7196aacab5caf0600e419c695 100644 (file)
--- a/lily/score-scheme.cc
+++ b/lily/score-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "score.hh"
@@ -13,7 +13,6 @@
 #include "global-context.hh"
 #include "lilypond-key.hh"
 
-
 LY_DEFINE (ly_make_score, "ly:make-score",
           1, 0, 0,
           (SCM music),
@@ -21,13 +20,11 @@ LY_DEFINE (ly_make_score, "ly:make-score",
 {
   Music *mus = unsmob_music (music);
   SCM_ASSERT_TYPE (mus, music, SCM_ARG1, __FUNCTION__, "music");
-  
+
   Score *score = new Score;
   score->set_music (music);
 
-  SCM self = score->self_scm ();
-  scm_gc_unprotect_object (self);
-  return self;
+  return score->unprotect ();
 }
 
 LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
@@ -58,8 +55,7 @@ LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
     return SCM_BOOL_F;
 
   score_def = score_def->clone ();
-  SCM prot = score_def->self_scm ();
-  scm_gc_unprotect_object (prot);
+  SCM prot = score_def->unprotect ();
 
   /* TODO: SCORE_DEF should be scaled according to OD->parent_ or OD
      itself. */
@@ -91,7 +87,7 @@ LY_DEFINE (ly_score_process, "ly:score-process",
                   default_header, SCM_ARG3, __FUNCTION__, "\\paper block");
   SCM_ASSERT_TYPE (unsmob_output_def (default_layout),
                   default_header, SCM_ARG4, __FUNCTION__, "\\layout block");
-  
+
   Object_key *key = new Lilypond_general_key (0, score->user_key_, 0);
 
   if (score->error_found_)
@@ -100,7 +96,7 @@ LY_DEFINE (ly_score_process, "ly:score-process",
   SCM header = ly_is_module (score->header_)
     ? score->header_
     : default_header;
-  
+
   for (int i = 0; i < score->defs_.size (); i++)
     default_rendering (score->get_music (), score->defs_[i]->self_scm (),
                       default_paper, header, basename, key->self_scm ());
@@ -113,8 +109,7 @@ LY_DEFINE (ly_score_process, "ly:score-process",
                         header, basename, key->self_scm ());
     }
 
-  scm_gc_unprotect_object (key->self_scm ());
+  key->unprotect ();
   return SCM_UNSPECIFIED;
 }
 
-