X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=ceb327d9ec228e7506adf664793ad5f566604a14;hb=d765f3af45be51f15da55cf570a4b172200e1035;hp=31643159815866bfa9bf9c6351d5ceb727df09aa;hpb=6ce61146edb1c36647b514778c29cdc9beedab6a;p=lilypond.git diff --git a/lily/score.cc b/lily/score.cc index 3164315981..ceb327d9ec 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -3,198 +3,180 @@ source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2002 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 "scm-hash.hh" +#include "cpu-timer.hh" +#include "main.hh" +#include "paper-def.hh" -extern String default_out_fn; -Score::Score() +/* + TODO: junkme. + */ +Score::Score () + : Input () { - pscore_p_=0; - paper_p_ = 0; - midi_p_ = 0; - errorlevel_i_ = 0; -} + input_file_ = 0; + header_ = 0; + music_ = SCM_EOL; + errorlevel_ = 0; -Score::Score(Score const &s) -{ - 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_); + smobify_self (); } -Score::~Score() -{ - delete music_p_; - delete pscore_p_; - delete paper_p_; - delete midi_p_; -} +/* + store point & click locations. + Global to save some time. (Sue us!) + */ +bool store_locations_global_b; -void -Score::run_translator(Global_translator * trans_l) +Score::Score (Score const &s) + : Input (s) { - trans_l->set_score (this); - Music_iterator * iter = Music_iterator::static_get_iterator_p(music_p_, - trans_l); - iter->construct_children(); - - trans_l->start(); - 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); - trans_l->print(); - - iter->process_and_next( w ); - trans_l->process(); + 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 ()); + errorlevel_ = s.errorlevel_; + if (s.header_) + { + header_ = (s.header_) ? new Scheme_hash_table (*s.header_): 0; + + scm_gc_unprotect_object (header_->self_scm ()); } - delete iter; - trans_l->finish(); } -void -Score::process() +Score::~Score () { - paper(); - midi(); + } + + void -Score::midi() +Score::run_translator (Music_output_def *odef) { - if ( !midi_p_ ) - return; - - *mlog << "\nCreating MIDI elements ..." << flush; - - 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; + /* + We want to know if we want to store locations, since they take a + lot of overhead. + */ + store_locations_global_b = (gh_eval_str ("point-and-click") != SCM_BOOL_F); + + Cpu_timer timer; + Global_translator * trans = odef->get_global_translator (); + if (!trans) + { + programming_error ("no toplevel translator"); + return ; } - print(); - *mlog << endl; -} - -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; + progress_indication (_ ("Interpreting music...")); + Music * music = unsmob_music (music_); + + trans->final_mom_ = music->length_mom (); + 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")); + errorlevel_ =1; + return ; } - - print(); - // debugging - *mlog << endl; - pscore_p_->process(); + trans->start (); + trans->run_iterator_on_me (iter); + iter->quit(); + scm_remember_upto_here_1 (protected_iter); + trans->finish (); - // output - paper_output(); -} + if (errorlevel_) + { + // should we? hampers debugging. + warning (_ ("Errors found/*, not processing score*/")); + } + Music_output * output = trans->get_output (); + scm_gc_unprotect_object (trans->self_scm ()); + + if (verbose_global_b) + progress_indication (_f ("elapsed time: %.2f seconds", timer.read ())); -void -Score::set(Paper_def *pap_p) -{ - delete paper_p_; - paper_p_ = pap_p; + if (!header_) + header_ = new Scheme_hash_table; // ugh + + output->header_ = header_; + output->origin_string_ = location_string (); + + progress_indication ("\n"); + output->process (); + + delete output ; } void -Score::set(Midi_def* midi_p) -{ - delete midi_p_; - midi_p_ = midi_p; +Score::process () +{ + if (!unsmob_music (music_)) + return; + + for (int i=0; i < defs_.size (); i++) + { + if (no_paper_global_b + && dynamic_cast (defs_[i])) + continue; + run_translator (defs_[i]); + } } - void -Score::print() const +Score::add_output (Music_output_def *pap) { -#ifndef NPRINT - mtor << "score {\n"; - music_p_->print(); - if (midi_p_) - midi_p_->print(); - - mtor << "}\n"; -#endif + defs_.push (pap); } -void -Score::paper_output() -{ - if (paper_p_->outfile_str_=="") - paper_p_->outfile_str_ = default_out_fn + ".out"; +IMPLEMENT_SMOBS (Score); +IMPLEMENT_DEFAULT_EQUAL_P (Score); - if ( errorlevel_i_ ) { - *mlog << "lilypond: warning: no output to: " << paper_p_->outfile_str_ - << " (errorlevel=" << errorlevel_i_ << ")" << endl; - return; - } - *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); - +SCM +Score::mark_smob (SCM s) +{ + Score * sc = (Score*) SCM_CELL_WORD_1 (s); + if (sc->header_) + scm_gc_mark (sc->header_->self_scm ()); + for (int i = sc->defs_.size (); i--;) + scm_gc_mark (sc->defs_[i]->self_scm ()); + + return sc->music_; } -void -Score::midi_output() +int +Score::print_smob (SCM , SCM p, scm_print_state*) { -#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_); -#endif -} + scm_puts ("#", p); + return 1; +}