X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=8600a6a1818e20f2d1063d486916f38e0eb3d101;hb=59ed0cee2aae58a3f0483f21261c68aee406fa10;hp=3d7ad33de0abcb4b3d3e7be56bb0cf0d187e2b77;hpb=0dc651561ed849b121d26cbd07a192e9fefeb832;p=lilypond.git diff --git a/lily/score.cc b/lily/score.cc index 3d7ad33de0..8600a6a181 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -3,265 +3,154 @@ source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--1998 Han-Wen Nienhuys */ -#include "tex-stream.hh" + #include "score.hh" -#include "score-column.hh" -#include "p-score.hh" #include "debug.hh" -#include "paper-def.hh" -#include "main.hh" +#include "music-output-def.hh" +#include "music-output.hh" #include "source.hh" #include "source-file.hh" -#include "midi-output.hh" -#include "midi-def.hh" -#include "p-col.hh" -#include "score-reg.hh" #include "music-iterator.hh" #include "music.hh" -#include "music-list.hh" -#include "input-register.hh" +#include "global-translator.hh" +#include "scope.hh" +#include "cpu-timer.hh" +#include "main.hh" +#include "paper-def.hh" -extern String default_out_fn; -Score::Score(Score const &s) +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_p_ = 0; + music_p_ = 0; + errorlevel_i_ = 0; } -void -Score::setup_music() +Score::Score (Score const &s) + : Input (s) { - *mlog << "\nSetting up requests..." << flush; - - Score_register * score_reg = - (Score_register*)lookup_reg("Score_register")->get_group_register_p(); - - score_reg->set_score (this); - Music_iterator * iter = Music_iterator::static_get_iterator_p(music_p_, - score_reg); - iter->construct_children(); + music_p_ = (s.music_p_) ? s.music_p_->clone() : 0; + for (int i=0; i < s.def_p_arr_.size (); i++) + def_p_arr_.push(s.def_p_arr_[i]->clone()); - while ( iter->ok() || score_reg->extra_mom_pq_.size() ) { - Moment w = INFTY; - if (iter->ok() ) { - w = iter->next_moment(); - iter->print(); - } - if (score_reg->extra_mom_pq_.size() && - score_reg->extra_mom_pq_.front() <= w) - - w = score_reg->extra_mom_pq_.get(); - - mtor << "processing moment " << w << "\n"; - - Score_column* c1 = new Score_column(w); - Score_column* c2 = new Score_column(w); - - c1->musical_b_ = false; - c2->musical_b_ = true; - - cols_.bottom().add(c1); - cols_.bottom().add(c2); - score_reg->set_cols(c1,c2); - - score_reg->post_move_processing(); - iter->next( w ); - - score_reg->process_requests(); - score_reg->do_announces(); - score_reg->pre_move_processing(); - score_reg->check_removal(); - } - delete iter; - score_reg->check_removal(); - score_reg->do_removal_processing(); - delete score_reg; + header_p_ = (s.header_p_) ? new Header (*s.header_p_): 0; } -void -Score::process() +Score::~Score() { - paper(); + delete header_p_; + for (int i=0; i < def_p_arr_.size (); i++) + delete def_p_arr_[i]; + delete music_p_; } void -Score::paper() +Score::run_translator (Music_output_def *odef_l) { - if (!paper_p_) - return; - - if( errorlevel_i_){ - // should we? hampers debugging. - warning("Errors found, /*not processing score*/"); -// return; + Cpu_timer timer; + Global_translator * trans_p = odef_l->get_global_translator_p(); + if (!trans_p) + { + non_fatal_error (_("no toplevel translator")); + return ; } - pscore_p_ = new PScore(paper_p_); - setup_music(); - do_cols(); - - clean_cols(); // can't move clean_cols() farther up. - print(); - calc_idealspacing(); + *mlog << '\n' << _("Interpreting music...") << flush; + trans_p->last_mom_ = music_p_->duration (); - // debugging - OK(); - *mlog << endl; - pscore_p_->process(); + Music_iterator * iter = Music_iterator::static_get_iterator_p (music_p_, trans_p); + - // output - paper_output(); - -} + iter->construct_children(); -/** - Remove empty cols, preprocess other columns. - */ -void -Score::clean_cols() -{ -#if 1 - for (iter_top(cols_,c); c.ok(); ) { - if (!c->pcol_l_->used_b()) { - delete c.remove_p(); - } else { - c->preprocess(); - c++; - } + if (! iter->ok()) + { + delete iter; + warning (_("need music in a score")); + errorlevel_i_ =1; + return ; } -#endif -} -PCursor -Score::find_col(Moment w, bool mus) -{ - iter_top( cols_,i); - - for (; i.ok(); i++) { - if (i->when() == w && i->musical_b_ == mus) - return i; - if (i->when() > w) - break; + trans_p->start(); + + while (iter->ok() || trans_p->moments_left_i ()) + { + Moment w; + w.set_infinite (1); + if (iter->ok()) + { + w = iter->next_moment(); + DOUT << "proccing: " << w << '\n'; + if (!monitor->silent_b ("walking")) + iter->print(); + } + + trans_p->modify_next (w); + trans_p->prepare (w); + + if (!monitor->silent_b ("walking")) + trans_p->print(); + + iter->process_and_next (w); + trans_p->process(); } - assert(false); - return i; -} + + delete iter; + trans_p->finish(); -void -Score::do_cols() -{ - iter_top(cols_,i); - for (; i.ok(); i++) { - pscore_p_->add(i->pcol_l_); + + if (errorlevel_i_) + { + // should we? hampers debugging. + warning (_ ("errors found, /*not processing score*/")); } -} -Moment -Score::last() const -{ - Moment l = 0; - // TODO - return l; -} + Music_output * output = trans_p->get_output_p(); + delete trans_p; + *mlog << endl << _f ("time: %.2f seconds", timer.read ()) << flush; -void -Score::set(Paper_def *pap_p) -{ - delete paper_p_; - paper_p_ = pap_p; -} + output->header_l_ = header_p_; + output->origin_str_ = location_str(); -void -Score::set(Midi_def* midi_p) -{ - delete midi_p_; - midi_p_ = midi_p; + *mlog << endl; + output->process(); + delete output ; } void -Score::OK() const +Score::process() { -#ifndef NDEBUG - cols_.OK(); - for (iter_top(cols_,cc); cc.ok() && (cc+1).ok(); cc++) { - assert(cc->when() <= (cc+1)->when()); + if (!music_p_) + return; + + print(); + for (int i=0; i < def_p_arr_.size (); i++) + { + if (no_paper_global_b + && def_p_arr_[i]->is_type_b (Paper_def::static_name ())) + continue; + run_translator (def_p_arr_[i]); } -#endif } + void Score::print() const { #ifndef NPRINT - mtor << "score {\n"; - music_p_->print(); - for (iter_top(cols_,i); i.ok(); i++) { - i->print(); - } - if (pscore_p_) - pscore_p_->print(); - if (midi_p_) - midi_p_->print(); - - mtor << "}\n"; + DOUT << "score {\n"; + music_p_ -> print (); + for (int i=0; i < def_p_arr_.size (); i++) + def_p_arr_[i]->print(); + DOUT << "}\n"; #endif } -Score::Score() -{ - pscore_p_=0; - paper_p_ = 0; - midi_p_ = 0; - errorlevel_i_ = 0; -} - -Score::~Score() -{ - delete music_p_; - delete pscore_p_; - delete paper_p_; - delete midi_p_; -} - -void -Score::paper_output() -{ - if (paper_p_->outfile=="") - paper_p_->outfile = default_out_fn + ".out"; - - if ( errorlevel_i_ ) { - *mlog << "lilypond: warning: no output to: " << paper_p_->outfile - << " (errorlevel=" << errorlevel_i_ << ")" << endl; - return; - } - - *mlog << "TeX output to " << paper_p_->outfile << " ...\n"; - - Tex_stream the_output(paper_p_->outfile); - - the_output << "% outputting Score, defined at: " << - location_str() << "\n"; - pscore_p_->output(the_output); - -} - void -Score::midi() +Score::add_output (Music_output_def *pap_p) { -#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 + def_p_arr_.push(pap_p); } -