X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=d007e2a2a2e509230d7a7860b25d1da75931dc77;hb=337f6bac894a741641eb9a0d78b3bc2c376fad12;hp=024810c1b567532f5d7d5480487cbecba170c2aa;hpb=94375d04f45b415ad705fd444fdb344416f116d9;p=lilypond.git diff --git a/lily/score.cc b/lily/score.cc index 024810c1b5..d007e2a2a2 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -3,189 +3,188 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ +#include + #include "ly-smobs.icc" -#include "scm-hash.hh" #include "score.hh" -#include "debug.hh" +#include "warn.hh" #include "music-output-def.hh" #include "music-output.hh" #include "music-iterator.hh" #include "music.hh" -#include "global-translator.hh" -#include "scope.hh" +#include "global-context.hh" +#include "scm-hash.hh" #include "cpu-timer.hh" #include "main.hh" #include "paper-def.hh" +#include "ly-module.hh" +#include "paper-book.hh" +#include "paper-score.hh" +#include "input-file-results.hh" /* TODO: junkme. */ - Score::Score () : Input () { - header_p_ = 0; + header_ = SCM_EOL; music_ = SCM_EOL; - errorlevel_i_ = 0; + smobify_self (); } +Score::~Score () +{ + +} + + + + +IMPLEMENT_SMOBS (Score); +IMPLEMENT_DEFAULT_EQUAL_P (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--;) + scm_gc_mark (sc->defs_[i]->self_scm ()); + + return sc->music_; +} + +int +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!) */ -bool store_locations_global_b; Score::Score (Score const &s) : Input (s) { music_ = SCM_EOL; - header_p_ = 0; + header_ = 0; smobify_self (); - /* - TODO: this is not very elegant.... - */ - /* store_locations_global_b = (scm_c_eval_string ("point-and-click") != SCM_BOOL_F);*/ - store_locations_global_b = (gh_eval_str ("point-and-click") != SCM_BOOL_F); - - 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.def_p_arr_.size (); i++) - def_p_arr_.push (s.def_p_arr_[i]->clone ()); - errorlevel_i_ = s.errorlevel_i_; - if (s.header_p_) - { - header_p_ = (s.header_p_) ? new Scheme_hash_table (*s.header_p_): 0; + for (int i = 0; i < s.defs_.size (); i++) + defs_.push (s.defs_[i]->clone ()); - scm_gc_unprotect_object (header_p_->self_scm ()); - } + header_ = ly_make_anonymous_module (); + if (ly_module_p (s.header_)) + ly_copy_module_variables (header_, s.header_); } -Score::~Score () +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.") { - -} + Music_output_def *odef = unsmob_music_output_def (output_def); + Music *music = unsmob_music (mus); -void -Score::run_translator (Music_output_def *odef_l) -{ + SCM_ASSERT_TYPE (music, mus, SCM_ARG1, __FUNCTION__, "Music"); + SCM_ASSERT_TYPE (odef, output_def, SCM_ARG2, __FUNCTION__, "Output definition"); + Cpu_timer timer; - - Global_translator * trans_p = odef_l->get_global_translator_p (); - if (!trans_p) + Global_context * trans = new Global_context (odef, + music->get_length () + ); + + if (!trans) { programming_error ("no toplevel translator"); - return ; + return SCM_BOOL_F; } progress_indication (_ ("Interpreting music...")); - Music * music = unsmob_music (music_); - trans_p->final_mom_ = music->length_mom (); - - - Music_iterator * iter = Music_iterator::static_get_iterator_p (music); - iter->init_translator (music, trans_p); + 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 (); if (! iter->ok ()) { - delete iter; warning (_ ("Need music in a score")); - errorlevel_i_ =1; - return ; + return SCM_BOOL_F; // todo: should throw exception. } - trans_p->start (); - trans_p->run_iterator_on_me (iter); - delete iter; - trans_p->finish (); + trans->run_iterator_on_me (iter); + iter->quit (); + scm_remember_upto_here_1 (protected_iter); + trans->finish (); - if (errorlevel_i_) - { - // should we? hampers debugging. - warning (_ ("Errors found/*, not processing score*/")); - } - - Music_output * output = trans_p->get_output_p (); - scm_gc_unprotect_object (trans_p->self_scm ()); - if (verbose_global_b) progress_indication (_f ("elapsed time: %.2f seconds", timer.read ())); - if (!header_p_) - header_p_ = new Scheme_hash_table; // ugh - Scope bla (header_p_); - output->header_l_ = &bla; - output->origin_str_ = location_str (); - - progress_indication ("\n"); - output->process (); - delete output ; - - /* - force GC. At this point, GUILE may give back mallocated area to - the system. - */ - - scm_gc (); + + return scm_gc_unprotect_object (trans->self_scm ()); } -void -Score::process () +// FIXME: silly name, score/music is rendered, not the output -- render midi? +LY_DEFINE (ly_render_output, "ly:render-output", + 2, 0, 0, (SCM context, SCM outname), + "Given a Score context in its final state," + "process it and return the (rendered) result.") { - if (!unsmob_music (music_)) - return; - + Global_context *g = dynamic_cast (unsmob_context (context)); + SCM_ASSERT_TYPE (g, context, SCM_ARG1, __FUNCTION__, "Global context"); + SCM_ASSERT_TYPE (gh_string_p (outname), outname, SCM_ARG2, __FUNCTION__, "output filename"); - for (int i=0; i < def_p_arr_.size (); i++) - { - if (no_paper_global_b - && dynamic_cast (def_p_arr_[i])) - continue; - run_translator (def_p_arr_[i]); - } + Music_output *output = g->get_output (); + progress_indication ("\n"); + // ugh, midi still wants outname + return output->process (ly_scm2string (outname)); } - - - void -Score::add_output (Music_output_def *pap_p) +default_rendering (SCM music, SCM outdef, SCM header, SCM outname) { - def_p_arr_.push (pap_p); -} - -IMPLEMENT_SMOBS (Score); -IMPLEMENT_DEFAULT_EQUAL_P (Score); -IMPLEMENT_UNSMOB (Score, score); + SCM context = ly_run_translator (music, outdef); -SCM -Score::mark_smob (SCM s) -{ - Score * sc = (Score*) SCM_CELL_WORD_1 (s); - if (sc->header_p_) - scm_gc_mark (sc->header_p_->self_scm ()); - for (int i = sc->def_p_arr_.size (); i--;) - scm_gc_mark (sc->def_p_arr_[i]->self_scm ()); - - return sc->music_; -} - -int -Score::print_smob (SCM , SCM p, scm_print_state*) -{ - scm_puts ("#", p); - - return 1; + if (Global_context *g = dynamic_cast + (unsmob_context (context))) + { + SCM systems = ly_render_output (context, outname); + Music_output *output = g->get_output (); + if (systems != SCM_UNDEFINED) + { + 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)); + } + delete output; + } }