X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=c3fcf3ae6ff37abaee159eaab4b481ad2e6d0509;hb=8536db51578c1d3ba3da834e5a308c2790dd4f87;hp=d00b774ec669f9e7768b865623419d4e6b7146ec;hpb=57be7394ffa2e7d7ba6d60548dba563f3409d472;p=lilypond.git diff --git a/lily/score.cc b/lily/score.cc index d00b774ec6..c3fcf3ae6f 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -15,17 +15,17 @@ #include "global-context.hh" #include "lily-parser.hh" #include "lilypond-key.hh" -#include "ly-smobs.icc" #include "main.hh" -#include "music-iterator.hh" #include "music.hh" #include "output-def.hh" -#include "output-def.hh" #include "paper-book.hh" #include "paper-score.hh" -#include "scm-hash.hh" #include "warn.hh" + +#include "music.hh" +#include "ly-smobs.icc" + Score::Score () : Input () { @@ -74,14 +74,23 @@ Score::Score (Score const &s) smobify_self (); Music *m = unsmob_music (s.music_); - music_ = m ? m->clone ()->self_scm () : SCM_EOL; - scm_gc_unprotect_object (music_); + if (m) + { + Music *mclone = m->clone (); + music_ = mclone->unprotect (); + } + else + music_ = SCM_EOL; + for (int i = 0, n = s.defs_.size (); i < n; i++) - defs_.push (s.defs_[i]->clone ()); - + { + Output_def * copy = s.defs_[i]->clone (); + defs_.push (copy); + copy->unprotect (); + } header_ = ly_make_anonymous_module (false); - if (ly_c_module_p (s.header_)) + if (ly_is_module (s.header_)) ly_module_copy (header_, s.header_); texts_ = s.texts_; @@ -105,52 +114,50 @@ default_rendering (SCM music, SCM outdef, Real scale = scm_to_double (bpd->c_variable ("outputscale")); Output_def *def = scale_output_def (unsmob_output_def (outdef), scale); - scaled_def = def->self_scm (); + Output_def *bdef = scale_output_def (bpd, scale); + def->parent_ = bdef; - scaled_bookdef = scale_output_def (bpd, scale)->self_scm (); - unsmob_output_def (scaled_def)->parent_ - = unsmob_output_def (scaled_bookdef); + scaled_def = def->self_scm (); + scaled_bookdef = bdef->self_scm(); - scm_gc_unprotect_object (scaled_bookdef); - scm_gc_unprotect_object (scaled_def); + def->unprotect(); + bdef->unprotect (); } SCM context = ly_run_translator (music, scaled_def, key); - if (Global_context *g = dynamic_cast - (unsmob_context (context))) + + SCM output_as_scm = ly_format_output (context); + Music_output *output = unsmob_music_output (output_as_scm); + + if (Paper_score *pscore = dynamic_cast (output)) { - SCM systems = ly_format_output (context, outname); - Music_output *output = g->get_output (); - if (systems != SCM_UNDEFINED) - { - /* 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); + /* 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_c_module_p (header)) - paper_book->add_score (header); - paper_book->add_score (systems); + if (ly_is_module (header)) + paper_book->add_score (header); - paper_book->classic_output (ly_scm2string (outname)); - scm_gc_unprotect_object (paper_book->self_scm ()); - } - delete output; + SCM systems = pscore->get_paper_systems (); + paper_book->add_score (systems); + + paper_book->classic_output (outname); + paper_book->unprotect (); } scm_remember_upto_here_1 (scaled_def); + scm_remember_upto_here_1 (output_as_scm); scm_remember_upto_here_1 (scaled_bookdef); } /* - Format score, return systems. OUTNAME is still passed to create a midi - file. + Format score, return list of Music_output objects. LAYOUTBOOK should be scaled already. */ SCM -Score::book_rendering (String outname, - Output_def *layoutbook, +Score::book_rendering (Output_def *layoutbook, Output_def *default_def, Object_key *book_key) { @@ -163,33 +170,35 @@ Score::book_rendering (String outname, if (layoutbook && layoutbook->c_variable ("is-paper") == SCM_BOOL_T) scale = scm_to_double (layoutbook->c_variable ("outputscale")); - SCM out = scm_makfrom0str (outname.to_str0 ()); - SCM systems = SCM_EOL; + SCM outputs = SCM_EOL; + SCM *tail = &outputs; + int outdef_count = defs_.size (); Object_key *key = new Lilypond_general_key (book_key, user_key_, 0); - SCM scm_key = key->self_scm (); - scm_gc_unprotect_object (scm_key); + SCM scm_key = key->unprotect (); for (int i = 0; !i || i < outdef_count; i++) { Output_def *def = outdef_count ? defs_[i] : default_def; SCM scaled = SCM_EOL; + if (def->c_variable ("is-layout") == SCM_BOOL_T) { def = scale_output_def (def, scale); def->parent_ = layoutbook; - scaled = def->self_scm (); - scm_gc_unprotect_object (scaled); + + scaled = def->unprotect (); } /* TODO: fix or junk --no-layout. */ SCM context = ly_run_translator (music_, def->self_scm (), scm_key); 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); + + *tail = scm_cons (s, SCM_EOL); + tail = SCM_CDRLOC(*tail); } scm_remember_upto_here_1 (scaled); @@ -197,17 +206,12 @@ Score::book_rendering (String outname, scm_remember_upto_here_1 (scm_key); scm_remember_upto_here_1 (scaled_bookdef); - return systems; + return outputs; } void -Score::set_music (SCM music, SCM parser) +Score::set_music (SCM music) { - /* URG? */ - SCM check_funcs = ly_lily_module_constant ("toplevel-music-functions"); - for (; scm_is_pair (check_funcs); check_funcs = scm_cdr (check_funcs)) - music = scm_call_2 (scm_car (check_funcs), music, parser); - if (unsmob_music (music_)) { unsmob_music (music)->origin ()->error (_ ("already have music in score")); @@ -218,7 +222,8 @@ Score::set_music (SCM music, SCM parser) { m->origin ()->error (_ ("errors found, ignoring music expression")); - this->error_found_ = this->error_found_ || to_boolean (m->get_property ("error-found")); + this->error_found_ = this->error_found_ + || to_boolean (m->get_property ("error-found")); } if (this->error_found_)