X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=d10023dd8506b5103bed7a09ef673a074cff8574;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=3a1232d2a268034c7a2494257d42c102ea75d4e0;hpb=c054eb280fd9953596eb164f67b0f9d5555c5a32;p=lilypond.git
diff --git a/lily/score.cc b/lily/score.cc
index 3a1232d2a2..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"
@@ -40,7 +40,7 @@ using namespace std;
Input *
Score::origin () const
{
- return Input::unsmob (input_location_);
+ return unsmob (input_location_);
}
Score::Score ()
@@ -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--;)
@@ -83,7 +83,7 @@ Score::Score (Score const &s)
smobify_self ();
input_location_ = s.origin ()->smobbed_copy ();
- Music *m = Music::unsmob (s.music_);
+ Music *m = unsmob (s.music_);
if (m)
{
Music *mclone = m->clone ();
@@ -117,7 +117,7 @@ Score::book_rendering (Output_def *layoutbook,
Real scale = 1.0;
- if (layoutbook && layoutbook->c_variable ("is-paper") == SCM_BOOL_T)
+ if (layoutbook && to_boolean (layoutbook->c_variable ("is-paper")))
scale = scm_to_double (layoutbook->c_variable ("output-scale"));
SCM outputs = SCM_EOL;
@@ -129,7 +129,7 @@ Score::book_rendering (Output_def *layoutbook,
Output_def *def = outdef_count ? defs_[i] : default_def;
SCM scaled = def->self_scm ();
- if (def->c_variable ("is-layout") == SCM_BOOL_T)
+ if (to_boolean (def->c_variable ("is-layout")))
{
def = scale_output_def (def, scale);
def->parent_ = layoutbook;
@@ -139,7 +139,7 @@ Score::book_rendering (Output_def *layoutbook,
/* TODO: fix or junk --no-layout. */
SCM context = ly_run_translator (music_, scaled);
- if (dynamic_cast (Context::unsmob (context)))
+ if (unsmob (context))
{
SCM s = ly_format_output (context);
@@ -155,24 +155,26 @@ Score::book_rendering (Output_def *layoutbook,
void
Score::set_music (SCM music)
{
- if (Music::is_smob (music_))
+ if (unsmob (music_))
{
- Music::unsmob (music)->origin ()->error (_ ("already have music in score"));
- Music::unsmob (music_)->origin ()->error (_ ("this is the previous music"));
+ unsmob (music)->origin ()->non_fatal_error
+ (_ ("already have music in score"));
+ unsmob (music_)->origin ()->non_fatal_error
+ (_ ("this is the previous music"));
}
- Music *m = Music::unsmob (music);
+ Music *m = unsmob (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