X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=168194891812db86b2d0885749a614cc8d8073d5;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=e35e8b5573c17cacbeac64605df3dbdb5d88fbd7;hpb=12fe81f3722e08e6dc6c64ec611638f0bf1beda9;p=lilypond.git diff --git a/lily/score.cc b/lily/score.cc index e35e8b5573..1681948918 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -3,38 +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 "book.hh" -#include "book-paper-def.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 "music-output-def.hh" -#include "music-output.hh" #include "music.hh" +#include "music.hh" +#include "output-def.hh" #include "paper-book.hh" -#include "paper-def.hh" #include "paper-score.hh" -#include "scm-hash.hh" -#include "score.hh" #include "warn.hh" -/* - TODO: junkme. - */ +#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 () @@ -43,202 +52,157 @@ Score::~Score () IMPLEMENT_SMOBS (Score); IMPLEMENT_DEFAULT_EQUAL_P (Score); +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); return 1; } - - -/* - store point & click locations. - Global to save some time. (Sue us!) - */ - 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 ()); + Music *m = unsmob_music (s.music_); + if (m) + { + Music *mclone = m->clone (); + music_ = mclone->unprotect (); + } + else + music_ = SCM_EOL; + for (vsize i = 0, n = s.defs_.size (); i < n; i++) + { + Output_def *copy = s.defs_[i]->clone (); + defs_.push_back (copy); + copy->unprotect (); + } header_ = ly_make_anonymous_module (false); - if (is_module (s.header_)) - ly_import_module (header_, s.header_); + if (ly_is_module (s.header_)) + ly_module_copy (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.") + +/* + Format score, return list of Music_output objects. + + LAYOUTBOOK should be scaled already. +*/ +SCM +Score::book_rendering (Output_def *layoutbook, + Output_def *default_def) { - Music_output_def *odef = unsmob_music_output_def (output_def); - Music *music = unsmob_music (mus); - - 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) + if (error_found_) + return SCM_EOL; + + SCM scaled_bookdef = SCM_EOL; + Real scale = 1.0; + + 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++) { - programming_error ("no toplevel translator"); - return SCM_BOOL_F; + 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->unprotect (); + } + + /* TODO: fix or junk --no-layout. */ + SCM context = ly_run_translator (music_, def->self_scm ()); + if (dynamic_cast (unsmob_context (context))) + { + SCM s = ly_format_output (context); + + *tail = scm_cons (s, SCM_EOL); + tail = SCM_CDRLOC (*tail); + } + + scm_remember_upto_here_1 (scaled); } - 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); - iter->construct_children (); + scm_remember_upto_here_1 (scaled_bookdef); + return outputs; +} - if (!iter->ok ()) +void +Score::set_music (SCM music) +{ + if (unsmob_music (music_)) { - warning (_ ("Need music in a score")); - /* todo: should throw exception. */ - return SCM_BOOL_F; + unsmob_music (music)->origin ()->error (_ ("already have music in score")); + unsmob_music (music_)->origin ()->error (_ ("this is the previous music")); } + Music *m = unsmob_music (music); + if (m && to_boolean (m->get_property ("error-found"))) + { + m->origin ()->error (_ ("errors found, ignoring music expression")); - trans->run_iterator_on_me (iter); - iter->quit (); - scm_remember_upto_here_1 (protected_iter); - trans->finish (); + this->error_found_ = this->error_found_ + || to_boolean (m->get_property ("error-found")); + } - if (verbose_global_b) - progress_indication (_f ("elapsed time: %.2f seconds", timer.read ())); - - return scm_gc_unprotect_object (trans->self_scm ()); + if (this->error_found_) + this->music_ = SCM_EOL; + else + this->music_ = music; } -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.") +SCM +Score::get_music () const { - Global_context *g = dynamic_cast (unsmob_context (context)); - SCM_ASSERT_TYPE (g, context, SCM_ARG1, __FUNCTION__, "Global context"); - SCM_ASSERT_TYPE (ly_c_string_p (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)); + return music_; } void -default_rendering (SCM music, SCM outdef, - SCM book_outputdef, - SCM header, SCM outname) +Score::add_output_def (Output_def *def) { - SCM context = ly_run_translator (music, outdef); - - Book_paper_def *bpd = unsmob_book_paper_def (book_outputdef); - if (bpd && unsmob_paper (outdef)) - /* FIXME: memory leak */ - outdef = bpd->scale_paper (unsmob_paper (outdef))->self_scm (); - - 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) - { - Paper_book *paper_book = new Paper_book (); - Paper_score *ps = dynamic_cast (output); - - Score_lines sc; - sc.paper_ = ps->paper_; - sc.lines_ = systems; - sc.header_ = header; - - paper_book->score_lines_.push (sc); - - paper_book->classic_output (ly_scm2string (outname)); - scm_gc_unprotect_object (paper_book->self_scm ()); - } - delete output; - } + defs_.push_back (def); } - + SCM -Score::book_rendering (String outname, - Book_paper_def* paperbook, - Music_output_def *default_def, - Paper_def **paper) +Score::get_header () const { - SCM out = scm_makfrom0str (outname.to_str0 ()); - SCM systems = SCM_EOL; - int outdef_count = defs_.size (); - for (int i = 0; !i || i < outdef_count; i++) - { - Music_output_def *def = outdef_count ? defs_[i] : default_def; - if (Paper_def * pd = dynamic_cast (def)) - { - def = paperbook->scale_paper (pd); - } - - if (!(no_paper_global_b && dynamic_cast (def))) - { - SCM context = ly_run_translator (music_, def->self_scm ()); - if (Global_context *g = dynamic_cast - (unsmob_context (context))) - { - SCM s = ly_format_output (context, out); - if (s != SCM_UNDEFINED) - { - systems = s; - /* Ugh. */ - Music_output *output = g->get_output (); - if (Paper_score *ps = dynamic_cast (output)) - *paper = ps->paper_; - } - } - } - } - return systems; + return header_; } -LY_DEFINE (ly_score_bookify, "ly:score-bookify", - 1, 0, 0, - (SCM score_smob), - "Return SCORE encapsulated in a BOOK.") +void +Score::set_header (SCM module) { - SCM_ASSERT_TYPE (unsmob_score (score_smob), score_smob, SCM_ARG1, __FUNCTION__, "score_smob"); - - Score *score = unsmob_score (score_smob); - Book *book = new Book; - book->scores_.push (score); - scm_gc_unprotect_object (book->self_scm ()); - return book->self_scm (); + assert (ly_is_module (module)); + header_ = module; }