*** empty log message ***

[lilypond.git] / lily / score.cc

diff --git a/lily/score.cc b/lily/score.cc
index 99648187603784400fddac08ee4195dc63f3e2d1..3a7d5a408a382a281aa342416d53b9307346f8ea 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -8,8 +8,8 @@
 
 #include <stdio.h>
 
+#include "lily-parser.hh"
 #include "book.hh"
-
 #include "cpu-timer.hh"
 #include "global-context.hh"
 #include "ly-module.hh"
@@ -31,6 +31,7 @@ Score::Score ()
 {
   header_ = SCM_EOL;
   music_ = SCM_EOL;
+  error_found_ = false;
   smobify_self ();
 }
 
@@ -65,7 +66,8 @@ Score::Score (Score const &s)
   : Input (s)
 {
   music_ = SCM_EOL;
-
+  error_found_ = s.error_found_;
+  
   /* FIXME: SCM_EOL? */
   header_ = 0;
 
@@ -146,7 +148,7 @@ LY_DEFINE (ly_format_output, "ly:format-output",
 {
   Global_context *g = dynamic_cast<Global_context*> (unsmob_context (context));
   SCM_ASSERT_TYPE (g, context, SCM_ARG1, __FUNCTION__, "Global context");
-  SCM_ASSERT_TYPE (ly_c_string_p (outname), outname, SCM_ARG2, __FUNCTION__, "output filename");
+  SCM_ASSERT_TYPE (scm_is_string (outname), outname, SCM_ARG2, __FUNCTION__, "output filename");
 
   Music_output *output = g->get_output ();
   progress_indication ("\n");
@@ -167,7 +169,7 @@ default_rendering (SCM music, SCM outdef,
   /* ugh.  */
   if (bpd->c_variable ("is-bookpaper") == SCM_BOOL_T)
     {
-      Real scale = ly_scm2double (bpd->c_variable ("outputscale"));
+      Real scale = scm_to_double (bpd->c_variable ("outputscale"));
       
       Output_def *def = scale_output_def (unsmob_output_def (outdef), scale);
       scaled_def = def->self_scm ();
@@ -221,11 +223,14 @@ Score::book_rendering (String outname,
                       Output_def *paperbook,
                       Output_def *default_def)
 {
+  if (error_found_)
+    return SCM_EOL;
+   
   SCM scaled_bookdef = SCM_EOL;
   Real scale = 1.0;
 
   if (paperbook && paperbook->c_variable ("is-bookpaper") == SCM_BOOL_T)
-    scale = ly_scm2double (paperbook->c_variable ("outputscale"));
+    scale = scm_to_double (paperbook->c_variable ("outputscale"));
   
   SCM out = scm_makfrom0str (outname.to_str0 ());
   SCM systems = SCM_EOL;
@@ -270,6 +275,11 @@ LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
   Score * sc = unsmob_score (score);
   Output_def *od = unsmob_output_def (paper);
 
+  if (sc->error_found_)
+    {
+      return SCM_EOL;
+    }
+  
   SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "Score");
   SCM_ASSERT_TYPE (od, paper, SCM_ARG2, __FUNCTION__, "Output_def");
 
@@ -292,9 +302,44 @@ LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
      itself. */
   score_def->parent_ = od;
   
-  SCM context = ly_run_translator (sc->music_, score_def->self_scm ());
+  SCM context = ly_run_translator (sc->get_music (), score_def->self_scm ());
   SCM lines = ly_format_output (context, scm_makfrom0str ("<embedded>"));
   
   scm_remember_upto_here_1 (prot);
   return lines;
 }
+
+void
+Score::set_music (SCM music, SCM parser)
+{
+  /* URG? */
+  SCM check_funcs = ly_scheme_function ("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);
+
+  if (unsmob_music (music_))
+    {
+      unsmob_music (music)->origin ()->error (_("Already have music in score"));
+      unsmob_music (music_)->origin ()->error (_("This is the previous music"));
+    }
+  Music * m = unsmob_music (music);
+  if (m && to_boolean (m->get_property ("error-found")))
+    {
+      m->origin()->error (_("Error found in this music expression. Ignoring it"));
+      
+      this->error_found_ = this->error_found_ || to_boolean (m->get_property ("error-found"));
+      
+    }
+
+  if (this->error_found_)
+    this->music_ = SCM_EOL; 
+  else
+    this->music_ = music;
+
+}
+
+SCM
+Score::get_music () const
+{
+  return music_;
+}