#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"
{
}
-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--;)
{
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