/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#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"
Input *
Score::origin () const
{
- return Input::unsmob (input_location_);
+ return unsmob<Input> (input_location_);
}
Score::Score ()
{
}
-const char Score::type_p_name_[] = "ly:score?";
+const char * const Score::type_p_name_ = "ly:score?";
SCM
-Score::mark_smob (SCM s)
+Score::mark_smob () const
{
- Score *sc = (Score *) SCM_CELL_WORD_1 (s);
-
- scm_gc_mark (sc->header_);
- for (vsize i = sc->defs_.size (); i--;)
- scm_gc_mark (sc->defs_[i]->self_scm ());
+ scm_gc_mark (header_);
+ for (vsize i = defs_.size (); i--;)
+ scm_gc_mark (defs_[i]->self_scm ());
- scm_gc_mark (sc->input_location_);
- return sc->music_;
-}
-
-int
-Score::print_smob (SCM, SCM p, scm_print_state *)
-{
- scm_puts ("#<Score>", p);
-
- return 1;
+ scm_gc_mark (input_location_);
+ return music_;
}
Score::Score (Score const &s)
+ : Smob<Score> ()
{
header_ = SCM_EOL;
music_ = SCM_EOL;
smobify_self ();
input_location_ = s.origin ()->smobbed_copy ();
- Music *m = Music::unsmob (s.music_);
+ Music *m = unsmob<Music> (s.music_);
if (m)
{
Music *mclone = m->clone ();
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;
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;
/* TODO: fix or junk --no-layout. */
SCM context = ly_run_translator (music_, scaled);
- if (dynamic_cast<Global_context *> (Context::unsmob (context)))
+ if (unsmob<Global_context> (context))
{
SCM s = ly_format_output (context);
void
Score::set_music (SCM music)
{
- if (Music::unsmob (music_))
+ if (unsmob<Music> (music_))
{
- Music::unsmob (music)->origin ()->error (_ ("already have music in score"));
- Music::unsmob (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 = Music::unsmob (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