X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=b1c1c554b3c8b22692cc3fa46a05ca751503b406;hb=b1a521c92717244d4bff11bb0b2b1304e4355956;hp=320c752caf55a4c858be1df303ca53410a52824f;hpb=eeafd68c62481b0d10c292f0e4bfa5d821168c87;p=lilypond.git diff --git a/lily/score.cc b/lily/score.cc index 320c752caf..b1c1c554b3 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -3,259 +3,194 @@ source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ -#include "tex-stream.hh" +#include + +#include "ly-smobs.icc" + #include "score.hh" -#include "score-column.hh" -#include "p-score.hh" -#include "debug.hh" -#include "paper-def.hh" -#include "main.hh" -#include "source.hh" -#include "source-file.hh" -#include "midi-output.hh" -#include "midi-def.hh" -#include "p-col.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 "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" -extern String default_out_fn; -Score::Score(Score const &s) +/* + TODO: junkme. + */ +Score::Score () + : Input () { - assert(!pscore_p_); - music_p_ = s.music_p_->clone(); - midi_p_ = new Midi_def(*s.midi_p_); - paper_p_ = new Paper_def(*s.paper_p_); + header_ = SCM_EOL; + music_ = SCM_EOL; + + smobify_self (); } -void -Score::run_translator(Global_translator * trans_l) +Score::~Score () { - trans_l->set_score (this); - Music_iterator * iter = Music_iterator::static_get_iterator_p(music_p_, - trans_l); - iter->construct_children(); - - while ( iter->ok() || trans_l->moments_left_i() ) { - Moment w = INFTY; - if (iter->ok() ) { - w = iter->next_moment(); - iter->print(); - } - trans_l->modify_next( w ); - trans_l->prepare(w); - iter->process_and_next( w ); - trans_l->process(); - } - delete iter; - trans_l->finish(); + } -void -Score::process() -{ - paper(); - midi(); -} -void -Score::midi() -{ - if (!midi_p_) - return; - - *mlog << "\nCreating elements ..." << endl; //flush; -// pscore_p_ = new PScore(paper_p_); - - Global_translator* score_trans= midi_p_->get_global_translator_p(); - run_translator( score_trans ); - delete score_trans; - - if( errorlevel_i_){ - // should we? hampers debugging. - warning("Errors found, /*not processing score*/"); -// return; - } - print(); - *mlog << endl; -// pscore_p_->process(); - // output - midi_output(); -} - -void -Score::paper() -{ - if (!paper_p_) - return; - - *mlog << "\nCreating elements ..." << flush; - pscore_p_ = new PScore(paper_p_); - - Global_translator * score_trans= paper_p_->get_global_translator_p(); - run_translator( score_trans ); - delete score_trans; - - if( errorlevel_i_){ - // should we? hampers debugging. - warning("Errors found, /*not processing score*/"); -// return; - } - do_cols(); - - clean_cols(); // can't move clean_cols() farther up. - print(); - calc_idealspacing(); - - // debugging - OK(); - *mlog << endl; - pscore_p_->process(); - - // output - paper_output(); -} +IMPLEMENT_SMOBS (Score); +IMPLEMENT_DEFAULT_EQUAL_P (Score); -/** - Remove empty cols, preprocess other columns. - */ -void -Score::clean_cols() -{ - for (iter_top(cols_,c); c.ok(); ) { - if (!c->pcol_l_->used_b()) { - delete c.remove_p(); - } else { - c->preprocess(); - c++; - } - } -} -PCursor -Score::find_col(Moment w, bool mus) +SCM +Score::mark_smob (SCM s) { - iter_top( cols_,i); - - for (; i.ok(); i++) { - if (i->when() == w && i->musical_b_ == mus) - return i; - if (i->when() > w) - break; - } - assert(false); - return i; -} + Score * sc = (Score*) SCM_CELL_WORD_1 (s); -void -Score::do_cols() -{ - iter_top(cols_,i); - for (; i.ok(); i++) { - pscore_p_->add(i->pcol_l_); - } + 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_; } -void -Score::set(Paper_def *pap_p) +int +Score::print_smob (SCM , SCM p, scm_print_state*) { - delete paper_p_; - paper_p_ = pap_p; -} + scm_puts ("#", p); -void -Score::set(Midi_def* midi_p) -{ - delete midi_p_; - midi_p_ = midi_p; + return 1; } -void -Score::OK() const -{ -#ifndef NDEBUG - cols_.OK(); - for (iter_top(cols_,cc); cc.ok() && (cc+1).ok(); cc++) { - assert(cc->when() <= (cc+1)->when()); - } -#endif -} -void -Score::print() const +/* + store point & click locations. + Global to save some time. (Sue us!) + */ + +Score::Score (Score const &s) + : Input (s) { -#ifndef NPRINT - mtor << "score {\n"; - music_p_->print(); - for (iter_top(cols_,i); i.ok(); i++) { - i->print(); + music_ = SCM_EOL; + header_ = 0; + 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 ()); + + header_ = ly_make_anonymous_module (); + if (ly_module_p (s.header_)) + ly_copy_module_variables (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.") +{ + 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); + + if (!trans) + { + programming_error ("no toplevel translator"); + return SCM_BOOL_F; + } + progress_indication (_ ("Interpreting music...")); + + trans->final_mom_ = music->get_length (); + 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 ()) + { + warning (_ ("Need music in a score")); + return SCM_BOOL_F; // todo: shoudl throw exception. } - if (pscore_p_) - pscore_p_->print(); - if (midi_p_) - midi_p_->print(); - - mtor << "}\n"; -#endif -} -Score::Score() -{ - pscore_p_=0; - paper_p_ = 0; - midi_p_ = 0; - errorlevel_i_ = 0; -} + trans->run_iterator_on_me (iter); + iter->quit (); + scm_remember_upto_here_1 (protected_iter); + trans->finish (); -Score::~Score() -{ - delete music_p_; - delete pscore_p_; - delete paper_p_; - delete midi_p_; + if (verbose_global_b) + progress_indication (_f ("elapsed time: %.2f seconds", timer.read ())); + + + return scm_gc_unprotect_object (trans->self_scm ()); } -void -Score::paper_output() +// 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 (paper_p_->outfile_str_=="") - paper_p_->outfile_str_ = default_out_fn + ".out"; - - if ( errorlevel_i_ ) { - *mlog << "lilypond: warning: no output to: " << paper_p_->outfile_str_ - << " (errorlevel=" << errorlevel_i_ << ")" << endl; - 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"); - *mlog << "TeX output to " << paper_p_->outfile_str_ << " ...\n"; - - Tex_stream the_output(paper_p_->outfile_str_); - - the_output << "% outputting Score, defined at: " << - location_str() << "\n"; - pscore_p_->output(the_output); - + Music_output *output = g->get_output (); + progress_indication ("\n"); + // ugh, midi still wants outname + return output->process (ly_scm2string (outname)); } void -Score::midi_output() +default_rendering (SCM music, SCM outdef, SCM header, SCM outname) { -#if 0 - if (!midi_p_) - return; - - if (midi_p_->outfile_str_ == "") - midi_p_->outfile_str_ = default_out_fn + ".midi"; - - *mlog << "midi output to " << midi_p_->outfile_str_ << " ...\n"; - Midi_output(this, midi_p_); + SCM context = ly_run_translator (music, outdef); + + 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); +#if 1 + paper_book->protect_ = scm_cons (systems, paper_book->protect_); + paper_book->protect_ = scm_cons (global_input_file->header_, + paper_book->protect_); + paper_book->protect_ = scm_cons (header, paper_book->protect_); + paper_book->protect_ = scm_cons (ps->paper_->smobbed_copy (), + paper_book->protect_); #endif + 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; + } } -