*** empty log message ***

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

diff --git a/lily/score-scheme.cc b/lily/score-scheme.cc
index f5b4369971ef58845a670116d4972c0ffdf84ed0..fce8296dc9a9111277691d5df5d55a2a2f4711bb 100644 (file)
--- a/lily/score-scheme.cc
+++ b/lily/score-scheme.cc
@@ -1,13 +1,11 @@
 /*
-  score-scheme.cc --  implement Score bindings.
+  score-scheme.cc -- implement Score bindings.
 
   source file of the GNU LilyPond music typesetter
 
   (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
 */
 
-
 #include "score.hh"
 #include "music.hh"
 #include "output-def.hh"
@@ -16,17 +14,17 @@
 LY_DEFINE (ly_music_scorify, "ly:music-scorify",
           2, 0, 0,
           (SCM music, SCM parser),
-          "Return MUSIC encapsulated in SCORE.")
+          "Return @var{music} with @var{texts} encapsulated in @var{score}.")
 {
-#if 0
-  SCM_ASSERT_TYPE (ly_c_music_p (music), music, SCM_ARG1, __FUNCTION__, "music");
-#endif
+  Music *mus = unsmob_music (music);
+  SCM_ASSERT_TYPE (mus, music, SCM_ARG1, __FUNCTION__, "music");
+  
   Score *score = new Score;
-
   score->set_music (music, parser);
 
-  scm_gc_unprotect_object (score->self_scm ());
-  return score->self_scm ();
+  SCM self = score->self_scm ();
+  scm_gc_unprotect_object (self);
+  return self;
 }
 
 LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
@@ -34,21 +32,18 @@ LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
           "Run @var{score} through @var{layout}, an output definition, "
           "scaled to correct outputscale already, "
           "return a list of layout-lines. "
-          "\nTake optional Object_key argument."
-          )
+          "\nTake optional Object_key argument.")
 {
-  Score * sc = unsmob_score (score);
+  Score *sc = unsmob_score (score);
   Output_def *od = unsmob_output_def (layout);
 
   if (sc->error_found_)
-    {
-      return SCM_EOL;
-    }
-  
+    return SCM_EOL;
+
   SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "Score");
   SCM_ASSERT_TYPE (od, layout, SCM_ARG2, __FUNCTION__, "Output_def");
 
-  Output_def * score_def  = 0;
+  Output_def *score_def = 0;
 
   /* UGR, FIXME, these are default \layout blocks once again.  They
      suck. */
@@ -57,8 +52,8 @@ LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
       score_def = sc->defs_[i];
 
   if (!score_def)
-    return scm_c_make_vector (0, SCM_EOL);
-      
+    return SCM_BOOL_F;
+
   score_def = score_def->clone ();
   SCM prot = score_def->self_scm ();
   scm_gc_unprotect_object (prot);
@@ -66,11 +61,11 @@ LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
   /* TODO: SCORE_DEF should be scaled according to OD->parent_ or OD
      itself. */
   score_def->parent_ = od;
-  
+
   SCM context = ly_run_translator (sc->get_music (), score_def->self_scm (),
                                   key);
-  SCM lines = ly_format_output (context, scm_makfrom0str ("<embedded>"));
-  
+  SCM output = ly_format_output (context);
+
   scm_remember_upto_here_1 (prot);
-  return lines;
+  return output;
 }