X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-scheme.cc;h=ed930d5fa0eaabaece18055cbc3783d50e6a72d4;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=7da2b20b466338aeebfda6a825c45fd08e77df70;hpb=634ad74db688a5305f001917453c5cd15305c539;p=lilypond.git diff --git a/lily/score-scheme.cc b/lily/score-scheme.cc index 7da2b20b46..ed930d5fa0 100644 --- a/lily/score-scheme.cc +++ b/lily/score-scheme.cc @@ -1,77 +1,145 @@ /* - score-scheme.cc -- implement Score bindings. + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2005--2015 Han-Wen Nienhuys - (c) 2005 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. -*/ + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ #include "score.hh" + #include "music.hh" #include "output-def.hh" #include "global-context.hh" +#include "music-output.hh" +#include "paper-score.hh" +#include "paper-book.hh" -LY_DEFINE (ly_music_scorify, "ly:music-scorify", - 3, 0, 0, - (SCM music, SCM texts, SCM parser), - "Return MUSIC with TEXTS encapsulated in SCORE.") +LY_DEFINE (ly_make_score, "ly:make-score", + 1, 0, 0, + (SCM music), + "Return score with @var{music} encapsulated in it.") { -#if 0 - SCM_ASSERT_TYPE (ly_c_music_p (music), music, SCM_ARG1, __FUNCTION__, "music"); -#endif + LY_ASSERT_SMOB (Music, music, 1); + Score *score = new Score; + score->set_music (music); + + 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 = Score::unsmob (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 = Score::unsmob (score); + Output_def *output_def = Output_def::unsmob (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 = Score::unsmob (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->set_music (music, parser); - score->texts_ = texts; + Score *sc = Score::unsmob (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 = Score::unsmob (score); + return sc->get_music (); +} - scm_gc_unprotect_object (score->self_scm ()); - return score->self_scm (); +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 = Score::unsmob (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.") { - Score * sc = unsmob_score (score); - Output_def *od = unsmob_output_def (layout); + LY_ASSERT_SMOB (Score, score, 1); + LY_ASSERT_SMOB (Output_def, layout, 2); + + Score *sc = Score::unsmob (score); + Output_def *od = Output_def::unsmob (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"); + return SCM_EOL; - Output_def * score_def = 0; + 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]; if (!score_def) - return scm_c_make_vector (0, SCM_EOL); - - score_def = score_def->clone (); - SCM prot = score_def->self_scm (); - scm_gc_unprotect_object (prot); - - /* TODO: SCORE_DEF should be scaled according to OD->parent_ or OD - itself. */ + return SCM_BOOL_F; + + /* 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)); + score_def->parent_ = od; - - SCM context = ly_run_translator (sc->get_music (), score_def->self_scm (), - key); - SCM lines = ly_format_output (context, scm_makfrom0str ("")); - - scm_remember_upto_here_1 (prot); - return lines; + + SCM context = ly_run_translator (sc->get_music (), score_def->unprotect ()); + SCM output = ly_format_output (context); + + return output; }