X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=168194891812db86b2d0885749a614cc8d8073d5;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=0e9564758c0dcb406cb5ce854156bb0a2eca8b3d;hpb=7fc56be6fb2efc3af50cec872ab486981d407da9;p=lilypond.git diff --git a/lily/score.cc b/lily/score.cc index 0e9564758c..1681948918 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -3,36 +3,47 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ -#include +#include "score.hh" + +#include + +using namespace std; -#include "lily-parser.hh" #include "book.hh" #include "cpu-timer.hh" #include "global-context.hh" -#include "ly-module.hh" -#include "ly-smobs.icc" +#include "international.hh" +#include "lily-parser.hh" #include "main.hh" -#include "music-iterator.hh" -#include "output-def.hh" -#include "music-output.hh" #include "music.hh" -#include "paper-book.hh" +#include "music.hh" #include "output-def.hh" +#include "paper-book.hh" #include "paper-score.hh" -#include "scm-hash.hh" -#include "score.hh" #include "warn.hh" +#include "ly-smobs.icc" + +Input * +Score::origin () const +{ + return unsmob_input (input_location_); +} + + Score::Score () - : Input () { header_ = SCM_EOL; music_ = SCM_EOL; + input_location_ = SCM_EOL; + error_found_ = false; + smobify_self (); + input_location_ = make_input (Input ()); } Score::~Score () @@ -46,16 +57,18 @@ IMPLEMENT_TYPE_P (Score, "ly:score?"); SCM Score::mark_smob (SCM s) { - Score *sc = (Score*) SCM_CELL_WORD_1 (s); - if (sc->header_) - scm_gc_mark (sc->header_); - for (int i = sc->defs_.size (); i--;) + Score *sc = (Score *) SCM_CELL_WORD_1 (s); + + scm_gc_mark (sc->header_); + for (vsize i = sc->defs_.size (); i--;) scm_gc_mark (sc->defs_[i]->self_scm ()); + + scm_gc_mark (sc->input_location_); return sc->music_; } int -Score::print_smob (SCM , SCM p, scm_print_state*) +Score::print_smob (SCM, SCM p, scm_print_state*) { scm_puts ("#", p); @@ -63,276 +76,110 @@ Score::print_smob (SCM , SCM p, scm_print_state*) } Score::Score (Score const &s) - : Input (s) { + header_ = SCM_EOL; music_ = SCM_EOL; - - /* FIXME: SCM_EOL? */ - header_ = 0; + input_location_ = SCM_EOL; + error_found_ = s.error_found_; smobify_self (); + input_location_ = make_input (*s.origin ()); - Music *m =unsmob_music (s.music_); - music_ = m ? m->clone ()->self_scm () : SCM_EOL; - scm_gc_unprotect_object (music_); - - for (int i = 0; i < s.defs_.size (); i++) - defs_.push (s.defs_[i]->clone ()); - - header_ = ly_make_anonymous_module (false); - if (ly_c_module_p (s.header_)) - ly_import_module (header_, s.header_); -} - - -LY_DEFINE (ly_run_translator, "ly:run-translator", - 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. " - "The context is returned in its final state.") -{ - Output_def *odef = unsmob_output_def (output_def); - Music *music = unsmob_music (mus); - - if (!music - || !music->get_length ().to_bool ()) - { - warning (_ ("Need music in a score")); - 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 ()); - - if (!trans) + Music *m = unsmob_music (s.music_); + if (m) { - programming_error ("no toplevel translator"); - return SCM_BOOL_F; + Music *mclone = m->clone (); + music_ = mclone->unprotect (); } - progress_indication (_ ("Interpreting music... ")); - - SCM protected_iter = Music_iterator::get_static_get_iterator (music); - Music_iterator * iter = unsmob_iterator (protected_iter); - iter->init_translator (music, trans); + else + music_ = SCM_EOL; - iter->construct_children (); - - if (!iter->ok ()) + for (vsize i = 0, n = s.defs_.size (); i < n; i++) { - warning (_ ("Need music in a score")); - /* todo: should throw exception. */ - return SCM_BOOL_F; + Output_def *copy = s.defs_[i]->clone (); + defs_.push_back (copy); + copy->unprotect (); } - - trans->run_iterator_on_me (iter); - iter->quit (); - scm_remember_upto_here_1 (protected_iter); - trans->finish (); - - if (verbose_global_b) - progress_indication (_f ("elapsed time: %.2f seconds", timer.read ())); - - return scm_gc_unprotect_object (trans->self_scm ()); -} - -LY_DEFINE (ly_format_output, "ly:format-output", - 2, 0, 0, (SCM context, SCM outname), - "Given a Score context in its final state," - "process it and return the (rendered) result.") -{ - Global_context *g = dynamic_cast (unsmob_context (context)); - SCM_ASSERT_TYPE (g, context, SCM_ARG1, __FUNCTION__, "Global context"); - SCM_ASSERT_TYPE (scm_is_string (outname), outname, SCM_ARG2, __FUNCTION__, "output filename"); - - Music_output *output = g->get_output (); - progress_indication ("\n"); - /* ugh, midi still wants outname */ - return output->process (ly_scm2string (outname)); + header_ = ly_make_anonymous_module (false); + if (ly_is_module (s.header_)) + ly_module_copy (header_, s.header_); } -void -default_rendering (SCM music, SCM outdef, - SCM book_outputdef, - SCM header, SCM outname) -{ - SCM scaled_def = outdef; - SCM scaled_bookdef = book_outputdef; - - Output_def *bpd = unsmob_output_def (book_outputdef); - - /* ugh. */ - if (bpd->c_variable ("is-bookpaper") == SCM_BOOL_T) - { - 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 (); - - scaled_bookdef = scale_output_def (bpd, scale)->self_scm (); - 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))) - { - 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->bookpaper_ = unsmob_output_def (scaled_bookdef); - - Score_systems sc; - sc.systems_ = systems; - sc.header_ = header; - - paper_book->score_systems_.push (sc); - - paper_book->classic_output (ly_scm2string (outname)); - scm_gc_unprotect_object (paper_book->self_scm ()); - } - delete output; - } - - scm_remember_upto_here_1 (scaled_def); - scm_remember_upto_here_1 (scaled_bookdef); -} /* -Format score, return systems. OUTNAME is still passed to create a midi -file. - -PAPERBOOK should be scaled already. + Format score, return list of Music_output objects. + LAYOUTBOOK should be scaled already. */ SCM -Score::book_rendering (String outname, - Output_def *paperbook, +Score::book_rendering (Output_def *layoutbook, Output_def *default_def) { if (error_found_) return SCM_EOL; - + SCM scaled_bookdef = SCM_EOL; Real scale = 1.0; - if (paperbook && paperbook->c_variable ("is-bookpaper") == SCM_BOOL_T) - scale = scm_to_double (paperbook->c_variable ("outputscale")); - - SCM out = scm_makfrom0str (outname.to_str0 ()); - SCM systems = SCM_EOL; + if (layoutbook && layoutbook->c_variable ("is-paper") == SCM_BOOL_T) + scale = scm_to_double (layoutbook->c_variable ("output-scale")); + + SCM outputs = SCM_EOL; + SCM *tail = &outputs; + int outdef_count = defs_.size (); + 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-paper") == SCM_BOOL_T) + SCM scaled = SCM_EOL; + + if (def->c_variable ("is-layout") == SCM_BOOL_T) { def = scale_output_def (def, scale); - def->parent_ = paperbook; - scaled = def->self_scm (); - scm_gc_unprotect_object (scaled); + def->parent_ = layoutbook; + + scaled = def->unprotect (); } - /* TODO: fix or junk --no-paper. */ + /* TODO: fix or junk --no-layout. */ SCM context = ly_run_translator (music_, def->self_scm ()); - if (dynamic_cast (unsmob_context (context))) + 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); } - - scm_remember_upto_here_1 (scaled_bookdef); - return systems; -} - - - -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.") -{ - Score * sc = unsmob_score (score); - Output_def *od = unsmob_output_def (paper); - - if (sc->error_found_) - { - return SCM_EOL; - } - - SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "Score"); - SCM_ASSERT_TYPE (od, paper, SCM_ARG2, __FUNCTION__, "Output_def"); - - 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 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. */ - score_def->parent_ = od; - - SCM context = ly_run_translator (sc->get_music (), score_def->self_scm ()); - SCM lines = ly_format_output (context, scm_makfrom0str ("")); - - scm_remember_upto_here_1 (prot); - return lines; + scm_remember_upto_here_1 (scaled_bookdef); + return outputs; } void -Score::set_music (SCM music, SCM parser) +Score::set_music (SCM music) { - /* URG? */ - SCM check_funcs = ly_scheme_function ("toplevel-music-functions"); - for (; ly_c_pair_p (check_funcs); check_funcs = ly_cdr (check_funcs)) - music = scm_call_2 (ly_car (check_funcs), music, parser); - if (unsmob_music (music_)) { - unsmob_music (music)->origin ()->error (_("Already have music in score")); - unsmob_music (music_)->origin ()->error (_("This is the previous music")); + unsmob_music (music)->origin ()->error (_ ("already have music in score")); + unsmob_music (music_)->origin ()->error (_ ("this is the previous music")); } - - if (Music * m = unsmob_music (music)) + Music *m = unsmob_music (music); + if (m && to_boolean (m->get_property ("error-found"))) { - m->origin()->error (_("Error found in this music expression. Ignoring it")); - - this->error_found_ = this->error_found_ || to_boolean (m->get_property ("error-found")); - + m->origin ()->error (_ ("errors found, ignoring music expression")); + + this->error_found_ = this->error_found_ + || to_boolean (m->get_property ("error-found")); } - this->music_ = music; if (this->error_found_) - this->music_ = SCM_EOL; + this->music_ = SCM_EOL; + else + this->music_ = music; } SCM @@ -340,3 +187,22 @@ Score::get_music () const { return music_; } + +void +Score::add_output_def (Output_def *def) +{ + defs_.push_back (def); +} + +SCM +Score::get_header () const +{ + return header_; +} + +void +Score::set_header (SCM module) +{ + assert (ly_is_module (module)); + header_ = module; +}