X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=00da8b5f772f0eb9aaad1ccef07f21aedb00d6c2;hb=4e288c484bb01fcfba0e191fe0cd2fc161308836;hp=94a3a252989e452ce540ebc01a967a6e0415ac12;hpb=675533acf58b9b863adc830f175696735ca6dc95;p=lilypond.git diff --git a/lily/score.cc b/lily/score.cc index 94a3a25298..00da8b5f77 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ #include @@ -16,11 +16,14 @@ #include "music-output.hh" #include "music-iterator.hh" #include "music.hh" -#include "global-translator.hh" +#include "global-context.hh" #include "scm-hash.hh" #include "cpu-timer.hh" #include "main.hh" #include "paper-def.hh" +#include "ly-module.hh" +#include "paper-book.hh" +#include "paper-score.hh" /* @@ -29,182 +32,180 @@ Score::Score () : Input () { - header_p_ = 0; + header_ = SCM_EOL; music_ = SCM_EOL; - errorlevel_i_ = 0; - smobify_self (); } +Score::~Score () +{ +} + +IMPLEMENT_SMOBS (Score); +IMPLEMENT_DEFAULT_EQUAL_P (Score); + +SCM +Score::mark_smob (SCM s) +{ + Score *sc = (Score*) SCM_CELL_WORD_1 (s); + if (sc->header_) + scm_gc_mark (sc->header_); + 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; +} + + + /* store point & click locations. Global to save some time. (Sue us!) */ -bool store_locations_global_b; Score::Score (Score const &s) : Input (s) { music_ = SCM_EOL; - header_p_ = 0; + + // FIXME: SCM_EOL? + header_ = 0; + smobify_self (); 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.def_p_arr_.size (); i++) - def_p_arr_.push (s.def_p_arr_[i]->clone ()); - errorlevel_i_ = s.errorlevel_i_; - if (s.header_p_) - { - header_p_ = (s.header_p_) ? new Scheme_hash_table (*s.header_p_): 0; - - scm_gc_unprotect_object (header_p_->self_scm ()); - } -} + for (int i = 0; i < s.defs_.size (); i++) + defs_.push (s.defs_[i]->clone ()); -Score::~Score () -{ - + header_ = ly_make_anonymous_module (); + if (is_module (s.header_)) + ly_import_module (header_, s.header_); } - -/* - should enable this to find weird mistakes? -*/ -#define PARANOIA - -#ifdef PARANOIA -#include -#endif - -void -Score::run_translator (Music_output_def *odef_l) +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.") { + Music_output_def *odef = unsmob_music_output_def (output_def); + Music *music = unsmob_music (mus); - -#ifdef PARANOIA - if (verbose_global_b) - { - struct rlimit rls; - - getrlimit (RLIMIT_STACK, &rls); - progress_indication (_f("stack size cur %d, max %d\n" ,rls.rlim_cur, rls.rlim_max)); - } -#endif - - /* - 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); + SCM_ASSERT_TYPE (music, mus, SCM_ARG1, __FUNCTION__, "Music"); + SCM_ASSERT_TYPE (odef, output_def, SCM_ARG2, __FUNCTION__, "Output definition"); Cpu_timer timer; - Global_translator * trans_p = odef_l->get_global_translator_p (); - if (!trans_p) + + Global_context * trans = new Global_context (odef, + music->get_length () + ); + + if (!trans) { programming_error ("no toplevel translator"); - return ; + return SCM_BOOL_F; } - progress_indication (_ ("Interpreting music...")); - Music * music = unsmob_music (music_); + progress_indication (_ ("Interpreting music... ")); - trans_p->final_mom_ = music->length_mom (); - - Music_iterator * iter = Music_iterator::static_get_iterator_p (music); - iter->init_translator (music, trans_p); + 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 ()) { - delete iter; warning (_ ("Need music in a score")); - errorlevel_i_ =1; - return ; + return SCM_BOOL_F; // todo: should throw exception. } - trans_p->start (); - trans_p->run_iterator_on_me (iter); - delete iter; - trans_p->finish (); - - if (errorlevel_i_) - { - // should we? hampers debugging. - warning (_ ("Errors found/*, not processing score*/")); - } + trans->run_iterator_on_me (iter); + iter->quit (); + scm_remember_upto_here_1 (protected_iter); + trans->finish (); - Music_output * output = trans_p->get_output_p (); - scm_gc_unprotect_object (trans_p->self_scm ()); - if (verbose_global_b) progress_indication (_f ("elapsed time: %.2f seconds", timer.read ())); - if (!header_p_) - header_p_ = new Scheme_hash_table; // ugh + + return scm_gc_unprotect_object (trans->self_scm ()); +} - output->header_l_ = header_p_; - output->origin_str_ = location_str (); +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 (is_string (outname), outname, SCM_ARG2, __FUNCTION__, "output filename"); + Music_output *output = g->get_output (); progress_indication ("\n"); - output->process (); - delete output ; - - /* - force GC. At this point, GUILE may give back mallocated area to - the system. - */ - - scm_gc (); + // ugh, midi still wants outname + return output->process (ly_scm2string (outname)); } void -Score::process () +default_rendering (SCM music, SCM outdef, SCM header, SCM outname) { - if (!unsmob_music (music_)) - return; + SCM context = ly_run_translator (music, outdef); - - for (int i=0; i < def_p_arr_.size (); i++) + if (Global_context *g = dynamic_cast + (unsmob_context (context))) { - if (no_paper_global_b - && dynamic_cast (def_p_arr_[i])) - continue; - run_translator (def_p_arr_[i]); + SCM systems = ly_format_output (context, outname); + Music_output *output = g->get_output (); + if (systems != SCM_UNDEFINED) + { + Paper_book *paper_book = new Paper_book (); + Paper_score *ps = dynamic_cast (output); + paper_book->papers_.push (ps->paper_); + paper_book->scores_.push (systems); + paper_book->headers_.push (header); + + paper_book->classic_output (ly_scm2string (outname)); + scm_gc_unprotect_object (paper_book->self_scm ()); + } + delete output; } } - - - -void -Score::add_output (Music_output_def *pap_p) -{ - def_p_arr_.push (pap_p); -} - -IMPLEMENT_SMOBS (Score); -IMPLEMENT_DEFAULT_EQUAL_P (Score); - - SCM -Score::mark_smob (SCM s) -{ - Score * sc = (Score*) SCM_CELL_WORD_1 (s); - if (sc->header_p_) - scm_gc_mark (sc->header_p_->self_scm ()); - for (int i = sc->def_p_arr_.size (); i--;) - scm_gc_mark (sc->def_p_arr_[i]->self_scm ()); - - return sc->music_; -} - -int -Score::print_smob (SCM , SCM p, scm_print_state*) +Score::book_rendering (String outname, Music_output_def *default_def, + Paper_def **paper) { - scm_puts ("#", p); - - return 1; + SCM out = scm_makfrom0str (outname.to_str0 ()); + SCM systems = SCM_EOL; + int outdef_count = defs_.size (); + for (int i = 0; !i || i < outdef_count; i++) + { + Music_output_def *def = outdef_count ? defs_[i] : default_def; + SCM context = ly_run_translator (music_, def->self_scm ()); + if (Global_context *g = dynamic_cast + (unsmob_context (context))) + { + SCM s = ly_format_output (context, out); + if (s != SCM_UNDEFINED) + { + systems = s; + /* Ugh. */ + Music_output *output = g->get_output (); + if (Paper_score *ps = dynamic_cast (output)) + *paper = ps->paper_; + } + } + } + return systems; }