X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-scheme.cc;h=9881bf3d4a68f1b1bacf3e05f45e28cafc009efb;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=ae8d014470ab83c8810bb0e76be5342a21cf7b46;hpb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;p=lilypond.git diff --git a/lily/score-scheme.cc b/lily/score-scheme.cc index ae8d014470..9881bf3d4a 100644 --- a/lily/score-scheme.cc +++ b/lily/score-scheme.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2005 Han-Wen Nienhuys + (c) 2005--2008 Han-Wen Nienhuys */ #include "score.hh" @@ -11,15 +11,16 @@ #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" LY_DEFINE (ly_make_score, "ly:make-score", 1, 0, 0, (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); @@ -27,27 +28,94 @@ LY_DEFINE (ly_make_score, "ly:make-score", return score->unprotect (); } +LY_DEFINE (ly_score_output_defs, "ly:score-output-defs", + 1, 0, 0, (SCM score), + "All output definitions in a score.") +{ + LY_ASSERT_SMOB (Score, score, 1); + Score *sc = unsmob_score (score); + + SCM l = SCM_EOL; + for (vsize i = 0; i < sc->defs_.size (); i++) + 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.") +{ + LY_ASSERT_SMOB (Score, score, 1); + 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.") +{ + LY_ASSERT_SMOB (Score, score, 1); + SCM_ASSERT_TYPE (ly_is_module (module), module, SCM_ARG2, __FUNCTION__, + "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.") +{ + LY_ASSERT_SMOB (Score, score, 1); + 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?") +{ + LY_ASSERT_SMOB (Score, score, 1); + Score *sc = unsmob_score (score); + return scm_from_bool (sc->error_found_); +} + 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, " - "return a list of layout-lines. " - "\nTake optional 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. 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 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]; @@ -61,55 +129,9 @@ LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format", itself. */ score_def->parent_ = od; - SCM context = ly_run_translator (sc->get_music (), score_def->self_scm (), - key); + SCM context = ly_run_translator (sc->get_music (), score_def->self_scm ()); SCM output = ly_format_output (context); scm_remember_upto_here_1 (prot); return output; } - -LY_DEFINE (ly_score_process, "ly:score-process", - 5, 0, 0, - (SCM score_smob, - SCM default_header, - SCM default_paper, - SCM default_layout, - SCM basename), - "Print score without page-layout: just print the systems.") -{ - Score *score = unsmob_score (score_smob); - - SCM_ASSERT_TYPE (score, score_smob, SCM_ARG1, __FUNCTION__, "score"); - - // allow header to be undefined. - SCM_ASSERT_TYPE (unsmob_output_def (default_paper), - 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_) - return SCM_UNSPECIFIED; - - SCM header = ly_is_module (score->header_) - ? score->header_ - : default_header; - - for (int 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 ()) - { - default_rendering (score->get_music (), - default_layout, - default_paper, - header, basename, key->self_scm ()); - } - - key->unprotect (); - return SCM_UNSPECIFIED; -} -