X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-scheme.cc;h=1d3e55bc6e31873047eae282ac033a6fe865fcf5;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=b48219ad44895e36a0f1ec77a705ba0563186014;hpb=8f5cd22af76fcb5c77853a5ede8b94ebef97caef;p=lilypond.git diff --git a/lily/score-scheme.cc b/lily/score-scheme.cc index b48219ad44..1d3e55bc6e 100644 --- a/lily/score-scheme.cc +++ b/lily/score-scheme.cc @@ -1,9 +1,20 @@ /* - 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--2006 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" @@ -11,18 +22,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}.") + 1, 0, 0, + (SCM music), + "Return score with @var{music} encapsulated in it.") { - 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); @@ -31,150 +40,106 @@ LY_DEFINE (ly_make_score, "ly:make-score", } LY_DEFINE (ly_score_output_defs, "ly:score-output-defs", - 1, 0, 0, (SCM score), - "All output defs in a score.") + 1, 0, 0, (SCM score), + "All output definitions in a score.") { - Score *sc = unsmob_score (score); - SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "score"); + LY_ASSERT_SMOB (Score, score, 1); + Score *sc = unsmob (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); + 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.") + 1, 0, 0, (SCM score), + "Return score header.") { - Score *sc = unsmob_score (score); - SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "score"); - return sc->header_; + LY_ASSERT_SMOB (Score, score, 1); + Score *sc = 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 *sc = 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.") + 1, 0, 0, (SCM score), + "Return score music.") { - Score *sc = unsmob_score (score); - SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "score"); + LY_ASSERT_SMOB (Score, score, 1); + Score *sc = unsmob (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?") { - Score *sc = unsmob_score (score); - SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "score"); + LY_ASSERT_SMOB (Score, score, 1); + Score *sc = 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 output-scale 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 = unsmob (score); + Output_def *od = 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"); - Output_def *score_def = 0; /* 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 (), - key); + 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; } - -LY_DEFINE (ly_score_process, "ly:render-music-as-systems", - 5, 0, 0, (SCM music, - SCM outdef, - SCM book_outputdef, - SCM header, - SCM outname), - "Create output using a default \\book block. ") -{ - SCM_ASSERT_TYPE(unsmob_music(music), music, - SCM_ARG1, __FUNCTION__, "music"); - SCM_ASSERT_TYPE(unsmob_output_def (outdef), outdef, - SCM_ARG2, __FUNCTION__, "output def"); - SCM_ASSERT_TYPE(unsmob_output_def (book_outputdef), book_outputdef, - SCM_ARG3, __FUNCTION__, "output def"); - SCM_ASSERT_TYPE(scm_is_string (outname), outname, - SCM_ARG5, __FUNCTION__, "string"); - - - SCM scaled_def = outdef; - SCM scaled_bookdef = book_outputdef; - - Output_def *bpd = unsmob_output_def (book_outputdef); - - /* ugh . */ - assert (bpd->c_variable ("is-paper") == SCM_BOOL_T); - - Real scale = scm_to_double (bpd->c_variable ("output-scale")); - - Output_def *def = scale_output_def (unsmob_output_def (outdef), scale); - Output_def *bdef = scale_output_def (bpd, scale); - def->parent_ = bdef; - - scaled_def = def->self_scm (); - scaled_bookdef = bdef->self_scm (); - - def->unprotect (); - bdef->unprotect (); - - SCM context = ly_run_translator (music, scaled_def, SCM_BOOL_F); - SCM output_as_scm = ly_format_output (context); - Music_output *output = unsmob_music_output (output_as_scm); - - Paper_score *pscore = dynamic_cast (output); - assert (pscore); - - /* ugh, this is strange, Paper_book without a Book object. */ - Paper_book *paper_book = new Paper_book (); - paper_book->header_ = header; - paper_book->paper_ = unsmob_output_def (scaled_bookdef); - - if (ly_is_module (header)) - paper_book->add_score (header); - - paper_book->add_score (pscore->self_scm ()); - paper_book->classic_output (outname); - paper_book->unprotect (); - - scm_remember_upto_here_1 (scaled_def); - scm_remember_upto_here_1 (scaled_bookdef); - - return SCM_UNSPECIFIED; -} -