source file of the GNU LilyPond music typesetter
- (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "score.hh"
#include "global-context.hh"
#include "lilypond-key.hh"
-
LY_DEFINE (ly_make_score, "ly:make-score",
1, 0, 0,
(SCM music),
{
Music *mus = unsmob_music (music);
SCM_ASSERT_TYPE (mus, music, SCM_ARG1, __FUNCTION__, "music");
-
+
Score *score = new Score;
score->set_music (music);
- SCM self = score->self_scm ();
- scm_gc_unprotect_object (self);
- return self;
+ return score->unprotect ();
}
LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
2, 1, 0, (SCM score, SCM layout, SCM key),
"Run @var{score} through @var{layout}, an output definition, "
- "scaled to correct outputscale already, "
+ "scaled to correct output-scale already, "
"return a list of layout-lines. "
"\nTake optional Object_key argument.")
{
/* UGR, FIXME, these are default \layout blocks once again. They
suck. */
- for (int i = 0; !score_def && i < sc->defs_.size (); i++)
+ for (vsize i = 0; !score_def && i < sc->defs_.size (); i++)
if (sc->defs_[i]->c_variable ("is-layout") == SCM_BOOL_T)
score_def = sc->defs_[i];
return SCM_BOOL_F;
score_def = score_def->clone ();
- SCM prot = score_def->self_scm ();
- scm_gc_unprotect_object (prot);
+ SCM prot = score_def->unprotect ();
/* TODO: SCORE_DEF should be scaled according to OD->parent_ or OD
itself. */
default_header, SCM_ARG3, __FUNCTION__, "\\paper block");
SCM_ASSERT_TYPE (unsmob_output_def (default_layout),
default_header, SCM_ARG4, __FUNCTION__, "\\layout block");
-
+
Object_key *key = new Lilypond_general_key (0, score->user_key_, 0);
if (score->error_found_)
SCM header = ly_is_module (score->header_)
? score->header_
: default_header;
-
- for (int i = 0; i < score->defs_.size (); i++)
+
+ for (vsize i = 0; i < score->defs_.size (); i++)
default_rendering (score->get_music (), score->defs_[i]->self_scm (),
default_paper, header, basename, key->self_scm ());
- if (score->defs_.is_empty ())
+ if (score->defs_.empty ())
{
default_rendering (score->get_music (),
default_layout,
header, basename, key->self_scm ());
}
- scm_gc_unprotect_object (key->self_scm ());
+ key->unprotect ();
return SCM_UNSPECIFIED;
}
-