* lily/include/lily-guile.hh: many new ly_ functions. Thanks to

[lilypond.git] / lily / score.cc

diff --git a/lily/score.cc b/lily/score.cc
index d007e2a2a2e509230d7a7860b25d1da75931dc77..622c2b8b151b6a73c517b403498ec716366624d6 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -95,7 +95,7 @@ Score::Score (Score const &s)
 
   header_ = ly_make_anonymous_module ();
   if (ly_module_p (s.header_))
-    ly_copy_module_variables (header_, s.header_);
+    ly_import_module (header_, s.header_);
 }
 
 LY_DEFINE (ly_run_translator, "ly:run-translator", 
@@ -122,7 +122,7 @@ LY_DEFINE (ly_run_translator, "ly:run-translator",
       programming_error ("no toplevel translator");
       return SCM_BOOL_F;
     }
-  progress_indication (_ ("Interpreting music..."));
+  progress_indication (_ ("Interpreting music... "));
   
   SCM protected_iter = Music_iterator::get_static_get_iterator (music);
   Music_iterator * iter = unsmob_iterator (protected_iter);
@@ -148,15 +148,14 @@ LY_DEFINE (ly_run_translator, "ly:run-translator",
   return scm_gc_unprotect_object (trans->self_scm ());
 }
 
-// FIXME: silly name, score/music is rendered, not the output -- render midi?
-LY_DEFINE (ly_render_output, "ly:render-output",
+LY_DEFINE (ly_format_output, "ly:format-output",
           2, 0, 0, (SCM context, SCM outname),
           "Given a Score context in its final state,"
            "process it and return the (rendered) result.")
 {
   Global_context *g = dynamic_cast<Global_context*> (unsmob_context (context));
   SCM_ASSERT_TYPE (g, context, SCM_ARG1, __FUNCTION__, "Global context");
-  SCM_ASSERT_TYPE (gh_string_p (outname), outname, SCM_ARG2, __FUNCTION__, "output filename");
+  SCM_ASSERT_TYPE (ly_string_p (outname), outname, SCM_ARG2, __FUNCTION__, "output filename");
 
   Music_output *output = g->get_output ();
   progress_indication ("\n");
@@ -172,7 +171,7 @@ default_rendering (SCM music, SCM outdef, SCM header, SCM outname)
   if (Global_context *g = dynamic_cast<Global_context*>
       (unsmob_context (context)))
     {
-      SCM systems = ly_render_output (context, outname);
+      SCM systems = ly_format_output (context, outname);
       Music_output *output = g->get_output ();
       if (systems != SCM_UNDEFINED)
        {