X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=168194891812db86b2d0885749a614cc8d8073d5;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=6d86607e68ce8f28812dea6aef370de495b38bb8;hpb=7c93f8e815a77c7735d0ab0f3cc4b21c19a10199;p=lilypond.git diff --git a/lily/score.cc b/lily/score.cc index 6d86607e68..1681948918 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -3,37 +3,47 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ #include "score.hh" #include +using namespace std; + #include "book.hh" #include "cpu-timer.hh" #include "global-context.hh" +#include "international.hh" #include "lily-parser.hh" -#include "lilypond-key.hh" -#include "ly-smobs.icc" #include "main.hh" -#include "music-iterator.hh" #include "music.hh" -#include "output-def.hh" +#include "music.hh" #include "output-def.hh" #include "paper-book.hh" #include "paper-score.hh" -#include "scm-hash.hh" #include "warn.hh" +#include "ly-smobs.icc" + +Input * +Score::origin () const +{ + return unsmob_input (input_location_); +} + + Score::Score () - : Input () { header_ = SCM_EOL; music_ = SCM_EOL; - texts_ = SCM_EOL; + input_location_ = SCM_EOL; + error_found_ = false; + smobify_self (); + input_location_ = make_input (Input ()); } Score::~Score () @@ -50,9 +60,10 @@ 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--;) + for (vsize i = sc->defs_.size (); i--;) scm_gc_mark (sc->defs_[i]->self_scm ()); + + scm_gc_mark (sc->input_location_); return sc->music_; } @@ -65,95 +76,44 @@ Score::print_smob (SCM, SCM p, scm_print_state*) } Score::Score (Score const &s) - : Input (s) { header_ = SCM_EOL; music_ = SCM_EOL; - texts_ = 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_); - music_ = m ? m->clone ()->self_scm () : SCM_EOL; - scm_gc_unprotect_object (music_); + if (m) + { + Music *mclone = m->clone (); + music_ = mclone->unprotect (); + } + else + music_ = SCM_EOL; - for (int i = 0, n = s.defs_.size (); i < n; i++) + for (vsize i = 0, n = s.defs_.size (); i < n; i++) { - Output_def * copy = s.defs_[i]->clone (); - defs_.push (copy); - scm_gc_unprotect_object (copy->self_scm ()); + Output_def *copy = s.defs_[i]->clone (); + defs_.push_back (copy); + copy->unprotect (); } header_ = ly_make_anonymous_module (false); - if (ly_c_module_p (s.header_)) + if (ly_is_module (s.header_)) ly_module_copy (header_, s.header_); - - texts_ = s.texts_; } -void -default_rendering (SCM music, SCM outdef, - SCM book_outputdef, - SCM header, - SCM outname, - SCM key) -{ - SCM scaled_def = outdef; - SCM scaled_bookdef = book_outputdef; - - Output_def *bpd = unsmob_output_def (book_outputdef); - - /* ugh. */ - if (bpd->c_variable ("is-paper") == SCM_BOOL_T) - { - Real scale = scm_to_double (bpd->c_variable ("outputscale")); - - Output_def *def = scale_output_def (unsmob_output_def (outdef), scale); - scaled_def = def->self_scm (); - - 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); - } - - SCM context = ly_run_translator (music, scaled_def, key); - - SCM output_as_scm = ly_format_output (context); - Music_output *output = unsmob_music_output (output_as_scm); - - 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 (ly_c_module_p (header)) - paper_book->add_score (header); - - SCM systems = pscore->get_paper_systems (); - paper_book->add_score (systems); - - paper_book->classic_output (ly_scm2string (outname)); - scm_gc_unprotect_object (paper_book->self_scm ()); - } - - scm_remember_upto_here_1 (scaled_def); - scm_remember_upto_here_1 (output_as_scm); - scm_remember_upto_here_1 (scaled_bookdef); -} /* - Format score, return list of Music_output objects. + 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) + Output_def *default_def) { if (error_found_) return SCM_EOL; @@ -162,16 +122,12 @@ Score::book_rendering (Output_def *layoutbook, Real scale = 1.0; if (layoutbook && layoutbook->c_variable ("is-paper") == SCM_BOOL_T) - scale = scm_to_double (layoutbook->c_variable ("outputscale")); + scale = scm_to_double (layoutbook->c_variable ("output-scale")); 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); + int outdef_count = defs_.size (); for (int i = 0; !i || i < outdef_count; i++) { @@ -182,24 +138,23 @@ Score::book_rendering (Output_def *layoutbook, { def = scale_output_def (def, scale); def->parent_ = layoutbook; - scaled = def->self_scm (); - scm_gc_unprotect_object (scaled); + + scaled = def->unprotect (); } /* TODO: fix or junk --no-layout. */ - SCM context = ly_run_translator (music_, def->self_scm (), scm_key); + 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); + 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; } @@ -217,7 +172,8 @@ Score::set_music (SCM music) { m->origin ()->error (_ ("errors found, ignoring music expression")); - this->error_found_ = this->error_found_ || to_boolean (m->get_property ("error-found")); + this->error_found_ = this->error_found_ + || to_boolean (m->get_property ("error-found")); } if (this->error_found_) @@ -231,3 +187,22 @@ Score::get_music () const { return music_; } + +void +Score::add_output_def (Output_def *def) +{ + defs_.push_back (def); +} + +SCM +Score::get_header () const +{ + return header_; +} + +void +Score::set_header (SCM module) +{ + assert (ly_is_module (module)); + header_ = module; +}