release commit

[lilypond.git] / lily / music.cc

diff --git a/lily/music.cc b/lily/music.cc
index 7ed8aacc9065cef914ad08ea295af01f31932f1f..9e980ea8212087afb18158ac463b67d674ba50a6 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -114,7 +114,7 @@ void
 print_alist (SCM a, SCM port)
 {
   /* SCM_EOL  -> catch malformed lists.  */
-  for (SCM s = a; ly_c_pair_p (s); s = ly_cdr (s))
+  for (SCM s = a; scm_is_pair (s); s = ly_cdr (s))
     {
       scm_display (ly_caar (s), port);
       scm_puts (" = ", port);
@@ -320,7 +320,7 @@ LY_DEFINE (ly_music_list_p,"ly:music-list?",
           "of music objects.")
 {
   if (scm_list_p (lst) == SCM_BOOL_T)
-    while (ly_c_pair_p (lst))
+    while (scm_is_pair (lst))
       {
        if (!unsmob_music (ly_car (lst)))
          return SCM_BOOL_F;
@@ -340,7 +340,7 @@ LY_DEFINE (ly_deep_mus_copy, "ly:music-deep-copy",
       copy = unsmob_music (m)->clone ()->self_scm ();
       scm_gc_unprotect_object (copy);
     }
-  else if (ly_c_pair_p (m))
+  else if (scm_is_pair (m))
     copy = scm_cons (ly_deep_mus_copy (ly_car (m)),
                    ly_deep_mus_copy (ly_cdr (m)));
   return copy;
@@ -379,21 +379,17 @@ LY_DEFINE (ly_music_compress, "ly:music-compress",
 }
 
 LY_DEFINE (ly_music_scorify, "ly:music-scorify",
-          1, 0, 0,
-          (SCM music),
+          2, 0, 0,
+          (SCM music, SCM parser),
           "Return MUSIC encapsulated in SCORE.")
 {
 #if 0
   SCM_ASSERT_TYPE (ly_c_music_p (music), music, SCM_ARG1, __FUNCTION__, "music");
 #endif
   Score *score = new Score;
-  
-  /* URG? */
-  SCM check_funcs = ly_scheme_function ("toplevel-music-functions");
-  for (; ly_c_pair_p (check_funcs); check_funcs = ly_cdr (check_funcs))
-    music = scm_call_1 (ly_car (check_funcs), music);
-  
-  score->music_ = music;
+
+  score->set_music (music, parser);
+
   scm_gc_unprotect_object (score->self_scm ());
   return score->self_scm ();
 }