X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=99ec51880a3672e5741447a5ff66864544cc1f73;hb=70d5609d63efe8a9b42ff763b79348bf99953bf2;hp=622c2b8b151b6a73c517b403498ec716366624d6;hpb=94a1966c72301b8bd1d8bb3b8628c3f089d007cf;p=lilypond.git diff --git a/lily/score.cc b/lily/score.cc index 622c2b8b15..99ec51880a 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -3,187 +3,237 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ -#include +#include "score.hh" -#include "ly-smobs.icc" +#include -#include "score.hh" -#include "warn.hh" -#include "music-output-def.hh" -#include "music-output.hh" -#include "music-iterator.hh" -#include "music.hh" -#include "global-context.hh" -#include "scm-hash.hh" +using namespace std; + +#include "book.hh" #include "cpu-timer.hh" +#include "global-context.hh" +#include "international.hh" +#include "lily-parser.hh" +#include "lilypond-key.hh" #include "main.hh" -#include "paper-def.hh" -#include "ly-module.hh" +#include "music.hh" +#include "music.hh" +#include "output-def.hh" #include "paper-book.hh" #include "paper-score.hh" -#include "input-file-results.hh" +#include "warn.hh" +#include "ly-smobs.icc" -/* - TODO: junkme. - */ Score::Score () : Input () { header_ = SCM_EOL; music_ = SCM_EOL; - + error_found_ = false; smobify_self (); } 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); + Score *sc = (Score *) SCM_CELL_WORD_1 (s); - if (sc->header_) - scm_gc_mark (sc->header_); - for (int i = sc->defs_.size (); i--;) + scm_gc_mark (sc->header_); + for (vsize i = sc->defs_.size (); i--;) scm_gc_mark (sc->defs_[i]->self_scm ()); - 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; - header_ = 0; + error_found_ = s.error_found_; smobify_self (); - 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; - header_ = ly_make_anonymous_module (); - if (ly_module_p (s.header_)) - ly_import_module (header_, s.header_); + 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 (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.") +void +default_rendering (SCM music, SCM outdef, + SCM book_outputdef, + SCM header, + SCM outname, + SCM key) { - Music_output_def *odef = unsmob_music_output_def (output_def); - Music *music = unsmob_music (mus); + SCM scaled_def = outdef; + SCM scaled_bookdef = book_outputdef; - 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) + Output_def *bpd = unsmob_output_def (book_outputdef); + + /* ugh. */ + if (bpd->c_variable ("is-paper") == SCM_BOOL_T) { - programming_error ("no toplevel translator"); - return SCM_BOOL_F; + 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 (); } - 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 context = ly_run_translator (music, scaled_def, key); + + SCM output_as_scm = ly_format_output (context); + Music_output *output = unsmob_music_output (output_as_scm); - if (! iter->ok ()) + if (Paper_score *pscore = dynamic_cast (output)) { - warning (_ ("Need music in a score")); - return SCM_BOOL_F; // todo: should throw exception. - } + /* 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); - trans->run_iterator_on_me (iter); - iter->quit (); - scm_remember_upto_here_1 (protected_iter); - trans->finish (); + if (ly_is_module (header)) + paper_book->add_score (header); - if (verbose_global_b) - progress_indication (_f ("elapsed time: %.2f seconds", timer.read ())); + paper_book->add_score (pscore->self_scm ()); + paper_book->classic_output (outname); + paper_book->unprotect (); + } - - return scm_gc_unprotect_object (trans->self_scm ()); + scm_remember_upto_here_1 (scaled_def); + scm_remember_upto_here_1 (output_as_scm); + scm_remember_upto_here_1 (scaled_bookdef); } -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 (ly_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)); -} +/* + Format score, return list of Music_output objects. -void -default_rendering (SCM music, SCM outdef, SCM header, SCM outname) + LAYOUTBOOK should be scaled already. +*/ +SCM +Score::book_rendering (Output_def *layoutbook, + Output_def *default_def, + Object_key *book_key) { - SCM context = ly_run_translator (music, outdef); + if (error_found_) + return SCM_EOL; + + SCM scaled_bookdef = SCM_EOL; + Real scale = 1.0; - if (Global_context *g = dynamic_cast - (unsmob_context (context))) + 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 (); + + Object_key *key = new Lilypond_general_key (book_key, user_key_, 0); + SCM scm_key = key->unprotect (); + + for (int i = 0; !i || i < outdef_count; i++) { - SCM systems = ly_format_output (context, outname); - Music_output *output = g->get_output (); - if (systems != SCM_UNDEFINED) + Output_def *def = outdef_count ? defs_[i] : default_def; + SCM scaled = SCM_EOL; + + if (def->c_variable ("is-layout") == SCM_BOOL_T) { - Paper_score *ps = dynamic_cast (output); - - paper_book->papers_.push (ps->paper_); - paper_book->scores_.push (systems); - paper_book->global_headers_.push (global_input_file->header_); - paper_book->headers_.push (header); - if (output_format_global != PAGE_LAYOUT) - paper_book->classic_output (ly_scm2string (outname)); + 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 (), scm_key); + if (dynamic_cast (unsmob_context (context))) + { + SCM s = ly_format_output (context); + + *tail = scm_cons (s, SCM_EOL); + tail = SCM_CDRLOC (*tail); } - delete output; + + scm_remember_upto_here_1 (scaled); + } + + scm_remember_upto_here_1 (scm_key); + scm_remember_upto_here_1 (scaled_bookdef); + return outputs; +} + +void +Score::set_music (SCM music) +{ + if (unsmob_music (music_)) + { + 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")); + + this->error_found_ = this->error_found_ + || to_boolean (m->get_property ("error-found")); } + + if (this->error_found_) + this->music_ = SCM_EOL; + else + this->music_ = music; +} + +SCM +Score::get_music () const +{ + return music_; +} + +void +Score::add_output_def (Output_def *def) +{ + defs_.push_back (def); }