X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=ac79dd103fc656988ca26906a7ee2ae2b5f17e83;hb=69bfbbd345ec788aef31315b6174cd15a2e3a48e;hp=86c10934b6f2f337e09ee235aff2cb7e5f80ba81;hpb=a2896b23ce12cc61e9cd4495324c9ca5551cb947;p=lilypond.git diff --git a/lily/score.cc b/lily/score.cc index 86c10934b6..ac79dd103f 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -3,235 +3,206 @@ source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2009 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 + +using namespace std; + +#include "book.hh" +#include "cpu-timer.hh" +#include "global-context.hh" +#include "international.hh" +#include "lily-parser.hh" #include "main.hh" -#include "source.hh" -#include "source-file.hh" -#include "midi-output.hh" -#include "midi-def.hh" -#include "p-col.hh" -#include "score-grav.hh" -#include "music-iterator.hh" #include "music.hh" -#include "music-list.hh" -#include "input-engraver.hh" +#include "music.hh" +#include "output-def.hh" +#include "paper-book.hh" +#include "paper-score.hh" +#include "warn.hh" -extern String default_out_fn; +#include "ly-smobs.icc" -Score::Score(Score const &s) +Input * +Score::origin () const { - 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_); + return unsmob_input (input_location_); } -void -Score::run_translator(Global_translator * acc_l) + +Score::Score () { - acc_l->set_score (this); - Music_iterator * iter = Music_iterator::static_get_iterator_p(music_p_, - acc_l); - iter->construct_children(); - - while ( iter->ok() || acc_l->moments_left_i() ) { - Moment w = INFTY; - if (iter->ok() ) { - w = iter->next_moment(); - iter->print(); - } - acc_l->modify_next( w ); - acc_l->prepare(w); - iter->next( w ); - acc_l->process(); - } - delete iter; - acc_l->finish(); -} + header_ = SCM_EOL; + music_ = SCM_EOL; + input_location_ = SCM_EOL; + error_found_ = false; -void -Score::process() -{ - paper(); + smobify_self (); + input_location_ = make_input (Input ()); } -void -Score::paper() +Score::~Score () { - if (!paper_p_) - return; - - *mlog << "\nCreating elements ..." << flush; - pscore_p_ = new PScore(paper_p_); - - Score_engraver * score_grav= - (Score_engraver*)lookup_grav("Score_engraver")->get_group_engraver_p(); - run_translator( score_grav ); - delete score_grav; - - 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(); - } -/** - Remove empty cols, preprocess other columns. - */ -void -Score::clean_cols() +IMPLEMENT_SMOBS (Score); +IMPLEMENT_DEFAULT_EQUAL_P (Score); +IMPLEMENT_TYPE_P (Score, "ly:score?"); + +SCM +Score::mark_smob (SCM s) { - for (iter_top(cols_,c); c.ok(); ) { - if (!c->pcol_l_->used_b()) { - delete c.remove_p(); - } else { - c->preprocess(); - c++; - } - } + Score *sc = (Score *) SCM_CELL_WORD_1 (s); + + scm_gc_mark (sc->header_); + for (vsize i = sc->defs_.size (); i--;) + scm_gc_mark (sc->defs_[i]->self_scm ()); + + scm_gc_mark (sc->input_location_); + return sc->music_; } -PCursor -Score::find_col(Moment w, bool mus) +int +Score::print_smob (SCM, SCM p, scm_print_state*) { - 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; + scm_puts ("#", p); + + return 1; } -void -Score::do_cols() +Score::Score (Score const &s) { - iter_top(cols_,i); - for (; i.ok(); i++) { - pscore_p_->add(i->pcol_l_); + header_ = SCM_EOL; + music_ = SCM_EOL; + input_location_ = SCM_EOL; + error_found_ = s.error_found_; + + smobify_self (); + input_location_ = make_input (*s.origin ()); + + Music *m = unsmob_music (s.music_); + if (m) + { + Music *mclone = m->clone (); + music_ = mclone->unprotect (); } + else + music_ = SCM_EOL; + + 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_); } -void -Score::set(Paper_def *pap_p) -{ - delete paper_p_; - paper_p_ = pap_p; -} -void -Score::set(Midi_def* midi_p) -{ - delete midi_p_; - midi_p_ = midi_p; -} +/* + Format score, return list of Music_output objects. -void -Score::OK() const + LAYOUTBOOK should be scaled already. +*/ +SCM +Score::book_rendering (Output_def *layoutbook, + Output_def *default_def) { -#ifndef NDEBUG - cols_.OK(); - for (iter_top(cols_,cc); cc.ok() && (cc+1).ok(); cc++) { - assert(cc->when() <= (cc+1)->when()); + if (error_found_) + return SCM_EOL; + + SCM scaled_bookdef = SCM_EOL; + Real scale = 1.0; + + 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 (); + + for (int i = 0; !i || i < outdef_count; i++) + { + Output_def *def = outdef_count ? defs_[i] : default_def; + SCM scaled = SCM_EOL; + + if (def->c_variable ("is-layout") == SCM_BOOL_T) + { + 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 ()); + if (dynamic_cast (unsmob_context (context))) + { + SCM s = ly_format_output (context); + + *tail = scm_cons (s, SCM_EOL); + tail = SCM_CDRLOC (*tail); + } + + scm_remember_upto_here_1 (scaled); } -#endif -} + scm_remember_upto_here_1 (scaled_bookdef); + return outputs; +} void -Score::print() const +Score::set_music (SCM music) { -#ifndef NPRINT - mtor << "score {\n"; - music_p_->print(); - for (iter_top(cols_,i); i.ok(); i++) { - i->print(); + if (unsmob_music (music_)) + { + unsmob_music (music)->origin ()->error (_ ("already have music in score")); + unsmob_music (music_)->origin ()->error (_ ("this is the previous music")); } - if (pscore_p_) - pscore_p_->print(); - if (midi_p_) - midi_p_->print(); - - mtor << "}\n"; -#endif -} + Music *m = unsmob_music (music); + if (m && to_boolean (m->get_property ("error-found"))) + { + m->origin ()->error (_ ("errors found, ignoring music expression")); -Score::Score() -{ - pscore_p_=0; - paper_p_ = 0; - midi_p_ = 0; - errorlevel_i_ = 0; + 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; } -Score::~Score() +SCM +Score::get_music () const { - delete music_p_; - delete pscore_p_; - delete paper_p_; - delete midi_p_; + return music_; } void -Score::paper_output() +Score::add_output_def (Output_def *def) { - 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; - } + defs_.push_back (def); +} - *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::get_header () const +{ + return header_; } void -Score::midi() +Score::set_header (SCM module) { -#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 + assert (ly_is_module (module)); + header_ = module; } -