X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=ee628b9b25f91863056b6726c67bb7d80ea98145;hb=16daefb5104997473ab77fd00faf00f34c6baa7e;hp=8e26e425cdea371eccbd8cea521b34cff0f5ffc3;hpb=c2d44e3a71b2d031305abede97a53f6e5fcf832b;p=lilypond.git diff --git a/lily/score.cc b/lily/score.cc index 8e26e425cd..ee628b9b25 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -3,27 +3,27 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ -#include +#include "score.hh" -#include "book.hh" +#include +#include "book.hh" #include "cpu-timer.hh" #include "global-context.hh" -#include "ly-module.hh" +#include "lily-parser.hh" +#include "lilypond-key.hh" #include "ly-smobs.icc" #include "main.hh" #include "music-iterator.hh" -#include "output-def.hh" -#include "music-output.hh" #include "music.hh" -#include "paper-book.hh" #include "output-def.hh" +#include "output-def.hh" +#include "paper-book.hh" #include "paper-score.hh" #include "scm-hash.hh" -#include "score.hh" #include "warn.hh" Score::Score () @@ -31,6 +31,8 @@ Score::Score () { header_ = SCM_EOL; music_ = SCM_EOL; + texts_ = SCM_EOL; + error_found_ = false; smobify_self (); } @@ -45,16 +47,17 @@ IMPLEMENT_TYPE_P (Score, "ly:score?"); SCM Score::mark_smob (SCM s) { - Score *sc = (Score*) SCM_CELL_WORD_1 (s); - if (sc->header_) - scm_gc_mark (sc->header_); + 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*) +Score::print_smob (SCM, SCM p, scm_print_state*) { scm_puts ("#", p); @@ -64,233 +67,167 @@ Score::print_smob (SCM , SCM p, scm_print_state*) Score::Score (Score const &s) : Input (s) { + header_ = SCM_EOL; music_ = SCM_EOL; - - /* FIXME: SCM_EOL? */ - header_ = 0; - + texts_ = SCM_EOL; + error_found_ = s.error_found_; smobify_self (); - Music *m =unsmob_music (s.music_); + 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++) + + 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_import_module (header_, s.header_); -} - - -LY_DEFINE (ly_run_translator, "ly:run-translator", - 2, 0, 0, (SCM mus, SCM output_def), - "Process @var{mus} according to @var{output_def}. " - "An interpretation context is set up, " - "and @var{mus} is interpreted with it. " - "The context is returned in its final state.") -{ - Output_def *odef = unsmob_output_def (output_def); - Music *music = unsmob_music (mus); - - if (!music) - return SCM_BOOL_F; + ly_module_copy (header_, s.header_); - SCM_ASSERT_TYPE (music, mus, SCM_ARG1, __FUNCTION__, "Music"); - SCM_ASSERT_TYPE (odef, output_def, SCM_ARG2, __FUNCTION__, "Output definition"); - - Cpu_timer timer; - - Global_context *trans = new Global_context (odef, music->get_length ()); - - if (!trans) - { - programming_error ("no toplevel translator"); - return SCM_BOOL_F; - } - progress_indication (_ ("Interpreting music... ")); - - SCM protected_iter = Music_iterator::get_static_get_iterator (music); - Music_iterator * iter = unsmob_iterator (protected_iter); - iter->init_translator (music, trans); - - iter->construct_children (); - - if (!iter->ok ()) - { - warning (_ ("Need music in a score")); - /* todo: should throw exception. */ - return SCM_BOOL_F; - } - - trans->run_iterator_on_me (iter); - iter->quit (); - scm_remember_upto_here_1 (protected_iter); - trans->finish (); - - if (verbose_global_b) - progress_indication (_f ("elapsed time: %.2f seconds", timer.read ())); - - return scm_gc_unprotect_object (trans->self_scm ()); -} - -LY_DEFINE (ly_format_output, "ly:format-output", - 2, 0, 0, (SCM context, SCM outname), - "Given a Score context in its final state," - "process it and return the (rendered) result.") -{ - Global_context *g = dynamic_cast (unsmob_context (context)); - SCM_ASSERT_TYPE (g, context, SCM_ARG1, __FUNCTION__, "Global context"); - SCM_ASSERT_TYPE (ly_c_string_p (outname), outname, SCM_ARG2, __FUNCTION__, "output filename"); - - Music_output *output = g->get_output (); - progress_indication ("\n"); - /* ugh, midi still wants outname */ - return output->process (ly_scm2string (outname)); + texts_ = s.texts_; } void default_rendering (SCM music, SCM outdef, SCM book_outputdef, - SCM header, SCM outname) + 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-bookpaper") == SCM_BOOL_T) + if (bpd->c_variable ("is-paper") == SCM_BOOL_T) { - Real scale = ly_scm2double (bpd->c_variable ("outputscale")); - + 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); - if (Global_context *g = dynamic_cast - (unsmob_context (context))) + + 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)) { - SCM systems = ly_format_output (context, outname); - Music_output *output = g->get_output (); - if (systems != SCM_UNDEFINED) - { - /* ugh, this is strange, Paper_book without a Book object. */ - Paper_book *paper_book = new Paper_book (); - paper_book->header_ = header; - paper_book->bookpaper_ = unsmob_output_def (scaled_bookdef); - - Score_lines sc; - sc.lines_ = systems; - sc.header_ = header; + /* 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); - paper_book->score_lines_.push (sc); - - paper_book->classic_output (ly_scm2string (outname)); - scm_gc_unprotect_object (paper_book->self_scm ()); - } - delete output; + 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_gc_unprotect_object (output->self_scm ()); scm_remember_upto_here_1 (scaled_def); scm_remember_upto_here_1 (scaled_bookdef); } /* -Format score, return systems. OUTNAME is still passed to create a midi -file. - -PAPERBOOK should be scaled already. + Format score, return list of Music_output objects. + LAYOUTBOOK should be scaled already. */ SCM -Score::book_rendering (String outname, - Output_def *paperbook, - Output_def *default_def) +Score::book_rendering (Output_def *layoutbook, + Output_def *default_def, + Object_key *book_key) { + if (error_found_) + return SCM_EOL; + SCM scaled_bookdef = SCM_EOL; Real scale = 1.0; - if (paperbook && paperbook->c_variable ("is-bookpaper") == SCM_BOOL_T) - scale = ly_scm2double (paperbook->c_variable ("outputscale")); + 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; - SCM out = scm_makfrom0str (outname.to_str0 ()); - SCM systems = SCM_EOL; 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 || i < outdef_count; i++) { Output_def *def = outdef_count ? defs_[i] : default_def; - SCM scaled= SCM_EOL; - if (def->c_variable ("is-paper") == SCM_BOOL_T) + SCM scaled = SCM_EOL; + + if (def->c_variable ("is-layout") == SCM_BOOL_T) { def = scale_output_def (def, scale); - def->parent_ = paperbook; + def->parent_ = layoutbook; scaled = def->self_scm (); scm_gc_unprotect_object (scaled); } - /* TODO: fix or junk --no-paper. */ - SCM context = ly_run_translator (music_, def->self_scm ()); - if (dynamic_cast (unsmob_context (context))) + /* 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, out); - if (s != SCM_UNDEFINED) - systems = s; + 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 systems; + return outputs; } - - - -LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format", - 2, 0, 0, (SCM score, SCM paper), - "Run @var{score} through @var{paper}, an output definition, " - "scaled to correct outputscale already, " - "return a list of paper-lines.") +void +Score::set_music (SCM music, SCM parser) { - Score * sc = unsmob_score (score); - Output_def *od = unsmob_output_def (paper); + /* 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); - SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "Score"); - SCM_ASSERT_TYPE (od, paper, SCM_ARG2, __FUNCTION__, "Output_def"); - - Output_def * score_def = 0; + 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")); - /* UGR, FIXME, these are default \paper blocks once again. They - suck. */ - for (int i = 0; !score_def && i < sc->defs_.size (); i++) - if (sc->defs_[i]->c_variable ("is-paper") == SCM_BOOL_T) - score_def = sc->defs_[i]; + this->error_found_ = this->error_found_ || to_boolean (m->get_property ("error-found")); + } - if (!score_def) - return scm_c_make_vector (0, SCM_EOL); - - score_def = score_def->clone (); - SCM prot = score_def->self_scm (); - scm_gc_unprotect_object (prot); + if (this->error_found_) + this->music_ = SCM_EOL; + else + this->music_ = music; +} - /* TODO: SCORE_DEF should be scaled according to OD->parent_ or OD - itself. */ - score_def->parent_ = od; - - SCM context = ly_run_translator (sc->music_, score_def->self_scm ()); - SCM lines = ly_format_output (context, scm_makfrom0str ("")); - - scm_remember_upto_here_1 (prot); - return lines; +SCM +Score::get_music () const +{ + return music_; }