#include "music.hh"
#include "output-def.hh"
#include "global-context.hh"
-#include "lilypond-key.hh"
#include "music-output.hh"
#include "paper-score.hh"
#include "paper-book.hh"
(SCM music),
"Return score with @var{music} encapsulated in @var{score}.")
{
- Music *mus = unsmob_music (music);
- SCM_ASSERT_TYPE (mus, music, SCM_ARG1, __FUNCTION__, "music");
+ LY_ASSERT_SMOB (Music, music, 1);
Score *score = new Score;
score->set_music (music);
LY_DEFINE (ly_score_output_defs, "ly:score-output-defs",
1, 0, 0, (SCM score),
- "All output defs in a score.")
+ "All output definitions in a score.")
{
+ LY_ASSERT_SMOB (Score, score, 1);
Score *sc = unsmob_score (score);
- SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "score");
SCM l = SCM_EOL;
for (vsize i = 0; i < sc->defs_.size (); i++)
- l = scm_cons (sc->defs_[i]->self_scm(), l);
+ l = scm_cons (sc->defs_[i]->self_scm (), l);
return scm_reverse_x (l, SCM_EOL);
}
-
+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}.")
+{
+ 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);
+ 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.")
+ "Return score header.")
{
+ LY_ASSERT_SMOB (Score, score, 1);
Score *sc = unsmob_score (score);
- SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "score");
return sc->header_;
}
LY_DEFINE (ly_score_music, "ly:score-music",
1, 0, 0, (SCM score),
- "return score music.")
+ "Return score music.")
{
+ LY_ASSERT_SMOB (Score, score, 1);
Score *sc = unsmob_score (score);
- SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "score");
return sc->get_music ();
}
1, 0, 0, (SCM score),
"Was there an error in the score?")
{
+ LY_ASSERT_SMOB (Score, score, 1);
Score *sc = unsmob_score (score);
- SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "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, "
- "return a list of layout-lines. "
- "\nTake optional Object_key argument.")
+ "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.")
{
+ 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);
if (sc->error_found_)
return SCM_EOL;
- SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "Score");
- SCM_ASSERT_TYPE (od, layout, SCM_ARG2, __FUNCTION__, "Output_def");
-
Output_def *score_def = 0;
/* UGR, FIXME, these are default \layout blocks once again. They