X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=6e1a9ff3e0d1f9af30063b2f5ec9322f77fa2f77;hb=76324bbc6789847e80b4bbdd4e8246d6e4eae8d1;hp=5e8fa7e7f12247dc077c5605fc8ac961cb42ff2b;hpb=2181534bd94587fcac8f1769f2dda7bece693649;p=lilypond.git diff --git a/lily/score.cc b/lily/score.cc index 5e8fa7e7f1..6e1a9ff3e0 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -3,142 +3,206 @@ source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ #include "score.hh" -#include "debug.hh" -#include "music-output-def.hh" -#include "music-output.hh" -#include "source.hh" -#include "source-file.hh" -#include "music-iterator.hh" -#include "music.hh" -#include "global-translator.hh" -#include "header.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 "music.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() +Input * +Score::origin () const { - header_p_ = 0; - music_p_ = 0; - errorlevel_i_ = 0; + return unsmob_input (input_location_); } -Score::Score (Score const &s) + +Score::Score () { - music_p_ = s.music_p_->clone(); - for (int i=0; i < s.def_p_arr_.size (); i++) - def_p_arr_.push(s.def_p_arr_[i]->clone()); - header_p_ = new Header (*s.header_p_); + header_ = SCM_EOL; + music_ = SCM_EOL; + input_location_ = SCM_EOL; + + error_found_ = false; + + smobify_self (); + input_location_ = make_input (Input ()); } -Score::~Score() +Score::~Score () { - delete header_p_; - for (int i=0; i < def_p_arr_.size (); i++) - delete def_p_arr_[i]; - delete music_p_; } -void -Score::run_translator (Music_output_def *odef_l) +IMPLEMENT_SMOBS (Score); +IMPLEMENT_DEFAULT_EQUAL_P (Score); +IMPLEMENT_TYPE_P (Score, "ly:score?"); + +SCM +Score::mark_smob (SCM s) { - Cpu_timer timer; - Global_translator * trans_p = odef_l->get_global_translator_p(); - if (!trans_p) - return ; - - *mlog << "\nInterpreting music ..."; - trans_p->last_mom_ = music_p_->time_int().max (); - - Music_iterator * iter = Music_iterator::static_get_iterator_p (music_p_, - trans_p); - iter->construct_children(); - - if (! iter->ok()) + 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_; +} + +int +Score::print_smob (SCM, SCM p, scm_print_state*) +{ + scm_puts ("#", p); + + return 1; +} + +Score::Score (Score const &s) +{ + 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) { - delete iter; - warning ("Need music in a score"); - errorlevel_i_ =1; - return ; + Music *mclone = m->clone (); + music_ = mclone->unprotect (); } - - trans_p->start(); - - while (iter->ok() || trans_p->moments_left_i ()) + 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_); +} + + +/* + Format score, return list of Music_output objects. + + LAYOUTBOOK should be scaled already. +*/ +SCM +Score::book_rendering (Output_def *layoutbook, + Output_def *default_def) +{ + 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++) { - Moment w = infinity_mom; - if (iter->ok()) + Output_def *def = outdef_count ? defs_[i] : default_def; + SCM scaled = SCM_EOL; + + if (def->c_variable ("is-layout") == SCM_BOOL_T) { - w = iter->next_moment(); - DOUT << "proccing: " << w <<"\n"; - iter->print(); + def = scale_output_def (def, scale); + def->parent_ = layoutbook; + + scaled = def->unprotect (); } - trans_p->modify_next (w); - trans_p->prepare (w); - trans_p->print(); - iter->process_and_next (w); - trans_p->process(); - } - delete iter; - trans_p->finish(); + /* 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); - - if (errorlevel_i_) - { - // should we? hampers debugging. - warning ("Errors found, /*not processing score*/"); + *tail = scm_cons (s, SCM_EOL); + tail = SCM_CDRLOC (*tail); + } + + scm_remember_upto_here_1 (scaled); } - - Music_output * output = trans_p->get_output_p(); - delete trans_p; - *mlog << " (time: " << String(timer.read (), "%.2f") << " seconds)"; - - - output->header_l_ = header_p_; - output->default_out_str_ = default_out_fn; - output->origin_str_ = location_str(); - - *mlog << endl; - output->process(); - delete output ; + + scm_remember_upto_here_1 (scaled_bookdef); + return outputs; } void -Score::process() +Score::set_music (SCM music) { - if (!music_p_) - return; - - print(); - for (int i=0; i < def_p_arr_.size (); i++) - run_translator (def_p_arr_[i]); -} - + if (unsmob_music (music_)) + { + unsmob_music (music)->origin ()->error (_ ("already have music in score")); + unsmob_music (music_)->origin ()->error (_ ("this is the previous music")); + } + Music *m = unsmob_music (music); + if (m && to_boolean (m->get_property ("error-found"))) + { + m->origin ()->error (_ ("errors found, ignoring music expression")); + 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; +} -void -Score::print() const +SCM +Score::get_music () const { -#ifndef NPRINT - DOUT << "score {\n"; - music_p_ -> print (); - for (int i=0; i < def_p_arr_.size (); i++) - def_p_arr_[i]->print(); - DOUT << "}\n"; -#endif + return music_; } void -Score::add (Music_output_def *pap_p) +Score::add_output_def (Output_def *def) { - def_p_arr_.push(pap_p); + defs_.push_back (def); } +SCM +Score::get_header () const +{ + return header_; +} - +void +Score::set_header (SCM module) +{ + assert (ly_is_module (module)); + header_ = module; +}