X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=d10023dd8506b5103bed7a09ef673a074cff8574;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=fe0f761fb7bad81ebf8dcdb2077b9d007a1f7097;hpb=0c14539bc83d6bb405141b6f21430b33d1e8fcf0;p=lilypond.git

diff --git a/lily/score.cc b/lily/score.cc
index fe0f761fb7..d10023dd85 100644
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -28,9 +28,9 @@ using namespace std;
 #include "global-context.hh"
 #include "international.hh"
 #include "lily-parser.hh"
+#include "ly-module.hh"
 #include "main.hh"
 #include "music.hh"
-#include "music.hh"
 #include "output-def.hh"
 #include "paper-book.hh"
 #include "paper-score.hh"
@@ -59,10 +59,10 @@ Score::~Score ()
 {
 }
 
-const char Score::type_p_name_[] = "ly:score?";
+const char * const Score::type_p_name_ = "ly:score?";
 
 SCM
-Score::mark_smob ()
+Score::mark_smob () const
 {
   scm_gc_mark (header_);
   for (vsize i = defs_.size (); i--;)
@@ -157,22 +157,24 @@ Score::set_music (SCM music)
 {
   if (unsmob<Music> (music_))
     {
-      unsmob<Music> (music)->origin ()->error (_ ("already have music in score"));
-      unsmob<Music> (music_)->origin ()->error (_ ("this is the previous music"));
+      unsmob<Music> (music)->origin ()->non_fatal_error
+        (_ ("already have music in score"));
+      unsmob<Music> (music_)->origin ()->non_fatal_error
+        (_ ("this is the previous music"));
     }
   Music *m = unsmob<Music> (music);
   if (m && to_boolean (m->get_property ("error-found")))
     {
-      m->origin ()->error (_ ("errors found, ignoring music expression"));
+      m->origin ()->non_fatal_error
+        (_ ("errors found, ignoring music expression"));
 
-      this->error_found_ = this->error_found_
-                           || to_boolean (m->get_property ("error-found"));
+      error_found_ = true;
     }
 
-  if (this->error_found_)
-    this->music_ = SCM_EOL;
+  if (error_found_)
+    music_ = SCM_EOL;
   else
-    this->music_ = music;
+    music_ = music;
 }
 
 SCM