/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2014 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
Input *
Score::origin () const
{
- return unsmob_input (input_location_);
+ return Input::unsmob (input_location_);
}
-
Score::Score ()
{
header_ = SCM_EOL;
}
int
-Score::print_smob (SCM, SCM p, scm_print_state*)
+Score::print_smob (SCM, SCM p, scm_print_state *)
{
scm_puts ("#<Score>", p);
smobify_self ();
input_location_ = make_input (*s.origin ());
- Music *m = unsmob_music (s.music_);
+ Music *m = Music::unsmob (s.music_);
if (m)
{
Music *mclone = m->clone ();
ly_module_copy (header_, s.header_);
}
-
/*
Format score, return list of Music_output objects.
*/
SCM
Score::book_rendering (Output_def *layoutbook,
- Output_def *default_def)
+ Output_def *default_def)
{
if (error_found_)
return SCM_EOL;
- SCM scaled_bookdef = SCM_EOL;
Real scale = 1.0;
if (layoutbook && layoutbook->c_variable ("is-paper") == SCM_BOOL_T)
scale = scm_to_double (layoutbook->c_variable ("output-scale"));
SCM outputs = SCM_EOL;
- SCM *tail = &outputs;
int outdef_count = defs_.size ();
for (int i = 0; !i || i < outdef_count; i++)
{
Output_def *def = outdef_count ? defs_[i] : default_def;
- SCM scaled = SCM_EOL;
+ SCM scaled = def->self_scm ();
if (def->c_variable ("is-layout") == SCM_BOOL_T)
- {
- def = scale_output_def (def, scale);
- def->parent_ = layoutbook;
+ {
+ def = scale_output_def (def, scale);
+ def->parent_ = layoutbook;
- scaled = def->unprotect ();
- }
+ scaled = def->unprotect ();
+ }
/* TODO: fix or junk --no-layout. */
- SCM context = ly_run_translator (music_, def->self_scm ());
- if (dynamic_cast<Global_context *> (unsmob_context (context)))
- {
- SCM s = ly_format_output (context);
+ SCM context = ly_run_translator (music_, scaled);
+ if (dynamic_cast<Global_context *> (Context::unsmob (context)))
+ {
+ SCM s = ly_format_output (context);
- *tail = scm_cons (s, SCM_EOL);
- tail = SCM_CDRLOC (*tail);
- }
+ outputs = scm_cons (s, outputs);
+ }
scm_remember_upto_here_1 (scaled);
}
- scm_remember_upto_here_1 (scaled_bookdef);
- return outputs;
+ return scm_reverse_x (outputs, SCM_EOL);
}
void
Score::set_music (SCM music)
{
- if (unsmob_music (music_))
+ if (Music::unsmob (music_))
{
- unsmob_music (music)->origin ()->error (_ ("already have music in score"));
- unsmob_music (music_)->origin ()->error (_ ("this is the previous music"));
+ Music::unsmob (music)->origin ()->error (_ ("already have music in score"));
+ Music::unsmob (music_)->origin ()->error (_ ("this is the previous music"));
}
- Music *m = unsmob_music (music);
+ Music *m = Music::unsmob (music);
if (m && to_boolean (m->get_property ("error-found")))
{
m->origin ()->error (_ ("errors found, ignoring music expression"));
this->error_found_ = this->error_found_
- || to_boolean (m->get_property ("error-found"));
+ || to_boolean (m->get_property ("error-found"));
}
if (this->error_found_)