/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2005--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2005--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 "paper-book.hh"
LY_DEFINE (ly_make_score, "ly:make-score",
- 1, 0, 0,
- (SCM music),
- "Return score with @var{music} encapsulated in @var{score}.")
+ 1, 0, 0,
+ (SCM music),
+ "Return score with @var{music} encapsulated in it.")
{
LY_ASSERT_SMOB (Music, music, 1);
}
LY_DEFINE (ly_score_output_defs, "ly:score-output-defs",
- 1, 0, 0, (SCM score),
- "All output definitions in a score.")
+ 1, 0, 0, (SCM score),
+ "All output definitions in a score.")
{
LY_ASSERT_SMOB (Score, score, 1);
- Score *sc = unsmob_score (score);
+ Score *sc = unsmob<Score> (score);
SCM l = SCM_EOL;
for (vsize i = 0; i < sc->defs_.size (); i++)
}
LY_DEFINE (ly_score_add_output_def_x, "ly:score-add-output-def!",
- 2, 0, 0, (SCM score, SCM def),
- "Add an output definition @var{def} to @var{score}.")
+ 2, 0, 0, (SCM score, SCM def),
+ "Add an output definition @var{def} to @var{score}.")
{
LY_ASSERT_SMOB (Score, score, 1);
LY_ASSERT_SMOB (Output_def, def, 2);
- Score *sc = unsmob_score (score);
- Output_def *output_def = unsmob_output_def (def);
+ Score *sc = unsmob<Score> (score);
+ Output_def *output_def = unsmob<Output_def> (def);
sc->add_output_def (output_def);
return SCM_UNSPECIFIED;
}
LY_DEFINE (ly_score_header, "ly:score-header",
- 1, 0, 0, (SCM score),
- "Return score header.")
+ 1, 0, 0, (SCM score),
+ "Return score header.")
{
LY_ASSERT_SMOB (Score, score, 1);
- Score *sc = unsmob_score (score);
+ Score *sc = unsmob<Score> (score);
return sc->get_header ();
}
-
LY_DEFINE (ly_score_set_header_x, "ly:score-set-header!",
- 2, 0, 0, (SCM score, SCM module),
- "Set the score header.")
+ 2, 0, 0, (SCM score, SCM module),
+ "Set the score header.")
{
LY_ASSERT_SMOB (Score, score, 1);
SCM_ASSERT_TYPE (ly_is_module (module), module, SCM_ARG2, __FUNCTION__,
- "module");
-
- Score *sc = unsmob_score (score);
+ "module");
+
+ Score *sc = unsmob<Score> (score);
sc->set_header (module);
return SCM_UNSPECIFIED;
}
-
LY_DEFINE (ly_score_music, "ly:score-music",
- 1, 0, 0, (SCM score),
- "Return score music.")
+ 1, 0, 0, (SCM score),
+ "Return score music.")
{
LY_ASSERT_SMOB (Score, score, 1);
- Score *sc = unsmob_score (score);
+ Score *sc = unsmob<Score> (score);
return sc->get_music ();
}
LY_DEFINE (ly_score_error_p, "ly:score-error?",
- 1, 0, 0, (SCM score),
- "Was there an error in the score?")
+ 1, 0, 0, (SCM score),
+ "Was there an error in the score?")
{
LY_ASSERT_SMOB (Score, score, 1);
- Score *sc = unsmob_score (score);
+ Score *sc = unsmob<Score> (score);
return scm_from_bool (sc->error_found_);
}
LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
- 2, 0, 0, (SCM score, SCM layout),
- "Run @var{score} through @var{layout} (an output definition)"
- " scaled to correct output-scale already, returning a list of"
- " layout-lines. This function takes an optional"
- " @code{Object_key} argument.")
+ 2, 0, 0, (SCM score, SCM layout),
+ "Run @var{score} through @var{layout} (an output definition)"
+ " scaled to correct output-scale already, returning a list of"
+ " layout-lines.")
{
LY_ASSERT_SMOB (Score, score, 1);
LY_ASSERT_SMOB (Output_def, layout, 2);
- Score *sc = unsmob_score (score);
- Output_def *od = unsmob_output_def (layout);
+ Score *sc = unsmob<Score> (score);
+ Output_def *od = unsmob<Output_def> (layout);
if (sc->error_found_)
return SCM_EOL;
/* UGR, FIXME, these are default \layout blocks once again. They
suck. */
for (vsize i = 0; !score_def && i < sc->defs_.size (); i++)
- if (sc->defs_[i]->c_variable ("is-layout") == SCM_BOOL_T)
+ if (to_boolean (sc->defs_[i]->c_variable ("is-layout")))
score_def = sc->defs_[i];
if (!score_def)
return SCM_BOOL_F;
- score_def = score_def->clone ();
- SCM prot = score_def->unprotect ();
+ /* Don't rescale if the layout has already been scaled */
+ if (to_boolean (score_def->c_variable ("cloned")))
+ score_def = score_def->clone ();
+ else
+ score_def = scale_output_def (score_def, output_scale (od));
- /* TODO: SCORE_DEF should be scaled according to OD->parent_ or OD
- itself. */
score_def->parent_ = od;
- SCM context = ly_run_translator (sc->get_music (), score_def->self_scm ());
+ SCM context = ly_run_translator (sc->get_music (), score_def->unprotect ());
SCM output = ly_format_output (context);
- scm_remember_upto_here_1 (prot);
return output;
}