X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=14fbb43a40b73555c12c5c27e2d984ebab22353b;hb=98ca84585c45f75503adff82fc0a8cec2a105769;hp=d3bc525fc167edcc53a45cf16bdfe04f5f7c8a74;hpb=084f3d97cdb0dde6d31d09f291a7f46423d15ce8;p=lilypond.git diff --git a/lily/score.cc b/lily/score.cc index d3bc525fc1..14fbb43a40 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -26,9 +26,6 @@ #include "score.hh" #include "warn.hh" -/* - TODO: junkme. - */ Score::Score () : Input () { @@ -43,6 +40,7 @@ Score::~Score () IMPLEMENT_SMOBS (Score); IMPLEMENT_DEFAULT_EQUAL_P (Score); +IMPLEMENT_TYPE_P (Score, "ly:score?"); SCM Score::mark_smob (SCM s) @@ -63,19 +61,12 @@ Score::print_smob (SCM , SCM p, scm_print_state*) return 1; } - - -/* - store point & click locations. - Global to save some time. (Sue us!) - */ - Score::Score (Score const &s) : Input (s) { music_ = SCM_EOL; - // FIXME: SCM_EOL? + /* FIXME: SCM_EOL? */ header_ = 0; smobify_self (); @@ -93,7 +84,7 @@ Score::Score (Score const &s) } LY_DEFINE (ly_run_translator, "ly:run-translator", - 2, 0, 0, (SCM mus, SCM output_def), + 2, 0, 0, (SCM mus, SCM output_def), "Process @var{mus} according to @var{output_def}. " "An interpretation context is set up, " "and @var{mus} is interpreted with it. " @@ -102,12 +93,15 @@ LY_DEFINE (ly_run_translator, "ly:run-translator", Output_def *odef = unsmob_output_def (output_def); Music *music = unsmob_music (mus); + if (!music) + return SCM_BOOL_F; + SCM_ASSERT_TYPE (music, mus, SCM_ARG1, __FUNCTION__, "Music"); SCM_ASSERT_TYPE (odef, output_def, SCM_ARG2, __FUNCTION__, "Output definition"); Cpu_timer timer; - Global_context * trans = new Global_context (odef, music->get_length ()); + Global_context *trans = new Global_context (odef, music->get_length ()); if (!trans) { @@ -151,7 +145,7 @@ LY_DEFINE (ly_format_output, "ly:format-output", Music_output *output = g->get_output (); progress_indication ("\n"); - // ugh, midi still wants outname + /* ugh, midi still wants outname */ return output->process (ly_scm2string (outname)); } @@ -165,25 +159,23 @@ default_rendering (SCM music, SCM outdef, Output_def *bpd = unsmob_output_def (book_outputdef); - /* - ugh. - */ + /* ugh. */ if (bpd->c_variable ("is-bookpaper") == SCM_BOOL_T) { Real scale = ly_scm2double (bpd->c_variable ("outputscale")); - Output_def * def = scale_output_def (unsmob_output_def (outdef), scale); + Output_def *def = scale_output_def (unsmob_output_def (outdef), scale); scaled_def = def->self_scm (); scaled_bookdef = scale_output_def (bpd, scale)->self_scm (); - unsmob_output_def (scaled_def)->parent_ = unsmob_output_def (scaled_bookdef); + unsmob_output_def (scaled_def)->parent_ + = unsmob_output_def (scaled_bookdef); scm_gc_unprotect_object (scaled_bookdef); scm_gc_unprotect_object (scaled_def); } SCM context = ly_run_translator (music, scaled_def); - if (Global_context *g = dynamic_cast (unsmob_context (context))) { @@ -191,11 +183,9 @@ default_rendering (SCM music, SCM outdef, Music_output *output = g->get_output (); if (systems != SCM_UNDEFINED) { - /* - ugh, this is strange, Paper_book without a Book object. - */ + /* ugh, this is strange, Paper_book without a Book object. */ Paper_book *paper_book = new Paper_book (); - + paper_book->header_ = header; paper_book->bookpaper_ = unsmob_output_def (scaled_bookdef); Score_lines sc; @@ -215,8 +205,12 @@ default_rendering (SCM music, SCM outdef, } /* - PAPERBOOK should be scaled already. - */ +Format score, return systems. OUTNAME is still passed to create a midi +file. + +PAPERBOOK should be scaled already. + +*/ SCM Score::book_rendering (String outname, Output_def *paperbook, @@ -226,9 +220,7 @@ Score::book_rendering (String outname, Real scale = 1.0; if (paperbook && paperbook->c_variable ("is-bookpaper") == SCM_BOOL_T) - { - scale = ly_scm2double (paperbook->c_variable ("outputscale")); - } + scale = ly_scm2double (paperbook->c_variable ("outputscale")); SCM out = scm_makfrom0str (outname.to_str0 ()); SCM systems = SCM_EOL; @@ -244,18 +236,14 @@ Score::book_rendering (String outname, scaled = def->self_scm (); scm_gc_unprotect_object (scaled); } - - if (!(no_paper_global_b && dynamic_cast (def))) + + /* TODO: fix or junk --no-paper. */ + SCM context = ly_run_translator (music_, def->self_scm ()); + if (dynamic_cast (unsmob_context (context))) { - SCM context = ly_run_translator (music_, def->self_scm ()); - if (dynamic_cast (unsmob_context (context))) - { - SCM s = ly_format_output (context, out); - if (s != SCM_UNDEFINED) - { - systems = s; - } - } + SCM s = ly_format_output (context, out); + if (s != SCM_UNDEFINED) + systems = s; } scm_remember_upto_here_1 (scaled); @@ -265,18 +253,44 @@ Score::book_rendering (String outname, return systems; } -LY_DEFINE (ly_score_bookify, "ly:score-bookify", - 2, 0, 0, - (SCM score_smob, SCM header), - "Return @var{score_smob} encapsulated in a Book object. Set " - "@var{header} as book level header.") + + + +LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format", + 2, 0, 0, (SCM score, SCM paper), + "Run @var{score} through @var{paper}, an output definition, " + "scaled to correct outputscale already, " + "return a list of paper-lines.") { - SCM_ASSERT_TYPE (unsmob_score (score_smob), score_smob, SCM_ARG1, __FUNCTION__, "score_smob"); + Score * sc = unsmob_score (score); + Output_def *od = unsmob_output_def (paper); + + SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "Score"); + SCM_ASSERT_TYPE (od, paper, SCM_ARG2, __FUNCTION__, "Output_def"); + + SCM lines = SCM_EOL; + Output_def * score_def = 0; + + /* UGR, FIXME, these are default \paper blocks once again. They + suck. */ + for (int i = 0; !score_def && i < sc->defs_.size (); i++) + if (sc->defs_[i]->c_variable ("is-paper") == SCM_BOOL_T) + score_def = sc->defs_[i]; + + if (!score_def) + return lines; + + 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. */ + score_def->parent_ = od; + + SCM context = ly_run_translator (sc->music_, score_def->self_scm ()); + lines = ly_format_output (context, scm_makfrom0str ("")); - Score *score = unsmob_score (score_smob); - Book *book = new Book; - book->scores_.push (score); - book->header_ = header; - scm_gc_unprotect_object (book->self_scm ()); - return book->self_scm (); + scm_remember_upto_here_1 (prot); + return lines; }