X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=ee628b9b25f91863056b6726c67bb7d80ea98145;hb=16daefb5104997473ab77fd00faf00f34c6baa7e;hp=650d7da8ea4097e6f246a531c02bd7ae1709d6c2;hpb=5df02e6bebe82a9da8ae4576bdbc08733161d636;p=lilypond.git diff --git a/lily/score.cc b/lily/score.cc index 650d7da8ea..ee628b9b25 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -3,176 +3,231 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ -#include +#include "score.hh" -#include "ly-smobs.icc" +#include -#include "score.hh" -#include "warn.hh" -#include "music-output-def.hh" -#include "music-output.hh" +#include "book.hh" +#include "cpu-timer.hh" +#include "global-context.hh" +#include "lily-parser.hh" +#include "lilypond-key.hh" +#include "ly-smobs.icc" +#include "main.hh" #include "music-iterator.hh" #include "music.hh" -#include "global-translator.hh" +#include "output-def.hh" +#include "output-def.hh" +#include "paper-book.hh" +#include "paper-score.hh" #include "scm-hash.hh" -#include "cpu-timer.hh" -#include "main.hh" -#include "paper-def.hh" - +#include "warn.hh" -/* - TODO: junkme. - */ Score::Score () : Input () { - input_file_ = 0; header_ = SCM_EOL; music_ = SCM_EOL; - errorlevel_ = 0; - + texts_ = SCM_EOL; + error_found_ = false; smobify_self (); } -/* - store point & click locations. - Global to save some time. (Sue us!) - */ -bool store_locations_global_b; +Score::~Score () +{ +} + +IMPLEMENT_SMOBS (Score); +IMPLEMENT_DEFAULT_EQUAL_P (Score); +IMPLEMENT_TYPE_P (Score, "ly:score?"); + +SCM +Score::mark_smob (SCM s) +{ + Score *sc = (Score *) SCM_CELL_WORD_1 (s); + + scm_gc_mark (sc->header_); + scm_gc_mark (sc->texts_); + for (int i = sc->defs_.size (); i--;) + scm_gc_mark (sc->defs_[i]->self_scm ()); + return sc->music_; +} + +int +Score::print_smob (SCM, SCM p, scm_print_state*) +{ + scm_puts ("#", p); + + return 1; +} Score::Score (Score const &s) : Input (s) { + header_ = SCM_EOL; music_ = SCM_EOL; - header_ = 0; + texts_ = SCM_EOL; + error_found_ = s.error_found_; smobify_self (); - Music * m =unsmob_music (s.music_); - music_ = m?m->clone ()->self_scm () : SCM_EOL; + 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_; - header_ = ly_make_anonymous_module (); - ly_copy_module_variable (header_, s.header_); -} -Score::~Score () -{ - -} + for (int i = 0, n = s.defs_.size (); i < n; i++) + defs_.push (s.defs_[i]->clone ()); + header_ = ly_make_anonymous_module (false); + if (ly_c_module_p (s.header_)) + ly_module_copy (header_, s.header_); + texts_ = s.texts_; +} void -Score::run_translator (Music_output_def *odef) +default_rendering (SCM music, SCM outdef, + SCM book_outputdef, + SCM header, + SCM outname, + SCM key) { - /* - 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 ; - } - 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); + SCM scaled_def = outdef; + SCM scaled_bookdef = book_outputdef; - iter->construct_children (); + Output_def *bpd = unsmob_output_def (book_outputdef); - if (! iter->ok ()) + /* ugh. */ + if (bpd->c_variable ("is-paper") == SCM_BOOL_T) { - warning (_ ("Need music in a score")); - errorlevel_ =1; - return ; - } + Real scale = scm_to_double (bpd->c_variable ("outputscale")); - trans->start (); - trans->run_iterator_on_me (iter); - iter->quit(); - scm_remember_upto_here_1 (protected_iter); - trans->finish (); + Output_def *def = scale_output_def (unsmob_output_def (outdef), scale); + scaled_def = def->self_scm (); - if (errorlevel_) - { - // should we? hampers debugging. - warning (_ ("Errors found/*, not processing score*/")); + scaled_bookdef = scale_output_def (bpd, scale)->self_scm (); + unsmob_output_def (scaled_def)->parent_ + = unsmob_output_def (scaled_bookdef); + + scm_gc_unprotect_object (scaled_bookdef); + scm_gc_unprotect_object (scaled_def); } - 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 ())); + SCM context = ly_run_translator (music, scaled_def, key); + Music_output *output = unsmob_music_output (ly_format_output (context)); + + if (Paper_score *pscore = dynamic_cast (output)) + { + /* ugh, this is strange, Paper_book without a Book object. */ + Paper_book *paper_book = new Paper_book (); + paper_book->header_ = header; + paper_book->paper_ = unsmob_output_def (scaled_bookdef); - if (!header_) - header_ = ly_make_anonymous_module(); // ug.h + if (ly_c_module_p (header)) + paper_book->add_score (header); - output->header_ = header_; - output->origin_string_ = location_string (); + SCM systems = pscore->get_paper_systems (); + paper_book->add_score (systems); - progress_indication ("\n"); - output->process (); - - delete output ; + paper_book->classic_output (ly_scm2string (outname)); + scm_gc_unprotect_object (paper_book->self_scm ()); + } + scm_gc_unprotect_object (output->self_scm ()); + + scm_remember_upto_here_1 (scaled_def); + scm_remember_upto_here_1 (scaled_bookdef); } -void -Score::process () +/* + Format score, return list of Music_output objects. + + LAYOUTBOOK should be scaled already. +*/ +SCM +Score::book_rendering (Output_def *layoutbook, + Output_def *default_def, + Object_key *book_key) { - if (!unsmob_music (music_)) - return; + 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 ("outputscale")); + + SCM outputs = SCM_EOL; + SCM *tail = &outputs; + + int outdef_count = defs_.size (); + + Object_key *key = new Lilypond_general_key (book_key, user_key_, 0); + SCM scm_key = key->self_scm (); + scm_gc_unprotect_object (scm_key); - for (int i=0; i < defs_.size (); i++) + for (int i = 0; !i || i < outdef_count; i++) { - if (no_paper_global_b - && dynamic_cast (defs_[i])) - continue; - run_translator (defs_[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->self_scm (); + scm_gc_unprotect_object (scaled); + } + + /* TODO: fix or junk --no-layout. */ + SCM context = ly_run_translator (music_, def->self_scm (), scm_key); + 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); } -} + scm_remember_upto_here_1 (scm_key); + scm_remember_upto_here_1 (scaled_bookdef); + return outputs; +} void -Score::add_output (Music_output_def *pap) +Score::set_music (SCM music, SCM parser) { - defs_.push (pap); -} - -IMPLEMENT_SMOBS (Score); -IMPLEMENT_DEFAULT_EQUAL_P (Score); + /* URG? */ + SCM check_funcs = ly_lily_module_constant ("toplevel-music-functions"); + for (; scm_is_pair (check_funcs); check_funcs = scm_cdr (check_funcs)) + music = scm_call_2 (scm_car (check_funcs), music, parser); + 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")); -SCM -Score::mark_smob (SCM s) -{ - Score * sc = (Score*) SCM_CELL_WORD_1 (s); + this->error_found_ = this->error_found_ || to_boolean (m->get_property ("error-found")); + } - scm_gc_mark (sc->header_); - for (int i = sc->defs_.size (); i--;) - scm_gc_mark (sc->defs_[i]->self_scm ()); - - return sc->music_; + if (this->error_found_) + this->music_ = SCM_EOL; + else + this->music_ = music; } -int -Score::print_smob (SCM , SCM p, scm_print_state*) +SCM +Score::get_music () const { - scm_puts ("#", p); - - return 1; + return music_; }