X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=622c2b8b151b6a73c517b403498ec716366624d6;hb=94a1966c72301b8bd1d8bb3b8628c3f089d007cf;hp=fd11b56542a483f23861e67cb84eb77a1d1685cd;hpb=13e79c0250d34b6bdfbafbc551ef64e8b59b2991;p=lilypond.git diff --git a/lily/score.cc b/lily/score.cc index fd11b56542..622c2b8b15 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -3,214 +3,187 @@ source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ -#include "tex-stream.hh" +#include + +#include "ly-smobs.icc" + #include "score.hh" -#include "score-column.hh" -#include "p-score.hh" -#include "debug.hh" -#include "paper-def.hh" -#include "main.hh" -#include "source.hh" -#include "source-file.hh" -#include "midi-def.hh" -#include "midi-stream.hh" -#include "audio-score.hh" -#include "p-col.hh" +#include "warn.hh" +#include "music-output-def.hh" +#include "music-output.hh" #include "music-iterator.hh" #include "music.hh" -#include "global-translator.hh" -#include "header.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" +#include "input-file-results.hh" -extern String default_out_fn; -Score::Score() +/* + TODO: junkme. + */ +Score::Score () + : Input () { - header_p_ =0; - pscore_p_=0; - audio_score_p_ = 0; - paper_p_ = 0; - midi_p_ = 0; - errorlevel_i_ = 0; -} + header_ = SCM_EOL; + music_ = SCM_EOL; -Score::Score (Score const &s) -{ - assert (!pscore_p_); - music_p_ = s.music_p_->clone(); - midi_p_ = new Midi_def (*s.midi_p_); - paper_p_ = new Paper_def (*s.paper_p_); - header_p_ = new Header(*s.header_p_); + smobify_self (); } -Score::~Score() +Score::~Score () { - delete header_p_; - delete music_p_; - delete pscore_p_; - delete audio_score_p_; - delete paper_p_; - delete midi_p_; + } -void -Score::run_translator (Global_translator * trans_l) + + + +IMPLEMENT_SMOBS (Score); +IMPLEMENT_DEFAULT_EQUAL_P (Score); + + +SCM +Score::mark_smob (SCM s) { - trans_l->set_score (this); - Music_iterator * iter = Music_iterator::static_get_iterator_p (music_p_, - trans_l); - iter->construct_children(); + Score * sc = (Score*) SCM_CELL_WORD_1 (s); - if ( ! iter->ok()) - { - delete iter; - warning ("Need music in a score"); - errorlevel_i_ =1; - return ; - } + if (sc->header_) + scm_gc_mark (sc->header_); + for (int i = sc->defs_.size (); i--;) + scm_gc_mark (sc->defs_[i]->self_scm ()); - trans_l->start(); - - while ( iter->ok() || trans_l->moments_left_i ()) - { - Moment w = infinity_mom; - if (iter->ok()) - { - w = iter->next_moment(); - DOUT << w; - iter->print(); - } - trans_l->modify_next (w); - trans_l->prepare (w); - trans_l->print(); - - iter->process_and_next (w); - trans_l->process(); - } - delete iter; - trans_l->finish(); + return sc->music_; } -void -Score::process() +int +Score::print_smob (SCM , SCM p, scm_print_state*) { - print(); - paper(); - midi(); + scm_puts ("#", p); + + return 1; } -void -Score::midi() + + +/* + store point & click locations. + Global to save some time. (Sue us!) + */ + +Score::Score (Score const &s) + : Input (s) { - if ( !midi_p_) - return; - - *mlog << "\nCreating MIDI elements ..." << flush; - audio_score_p_ = new Audio_score (this); - - Global_translator* score_trans= midi_p_->get_global_translator_p(); - run_translator (score_trans); - delete score_trans; + music_ = 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_); - if (errorlevel_i_) - { - // should we? hampers debugging. - warning ("Errors found, /*not processing score*/"); -// return; - } - *mlog << endl; + for (int i = 0; i < s.defs_.size (); i++) + defs_.push (s.defs_[i]->clone ()); - midi_output(); + header_ = ly_make_anonymous_module (); + if (ly_module_p (s.header_)) + ly_import_module (header_, s.header_); } - -void -Score::paper() + +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.") { - if (!paper_p_) - return; + Music_output_def *odef = unsmob_music_output_def (output_def); + Music *music = unsmob_music (mus); + + SCM_ASSERT_TYPE (music, mus, SCM_ARG1, __FUNCTION__, "Music"); + SCM_ASSERT_TYPE (odef, output_def, SCM_ARG2, __FUNCTION__, "Output definition"); - *mlog << "\nCreating elements ..." << flush; - pscore_p_ = new Paper_score (paper_p_); + Cpu_timer timer; - Global_translator * score_trans= paper_p_->get_global_translator_p(); - run_translator (score_trans); - delete score_trans; + Global_context * trans = new Global_context (odef, + music->get_length () + ); - if (errorlevel_i_) + if (!trans) { - // should we? hampers debugging. - warning ("Errors found, /*not processing score*/"); -// return; + programming_error ("no toplevel translator"); + return SCM_BOOL_F; } + progress_indication (_ ("Interpreting music... ")); - *mlog << endl; - pscore_p_->process(); + SCM protected_iter = Music_iterator::get_static_get_iterator (music); + Music_iterator * iter = unsmob_iterator (protected_iter); + iter->init_translator (music, trans); - // output - paper_output(); -} + iter->construct_children (); -void -Score::midi_output() -{ - if ( midi_p_->outfile_str_ == "") - midi_p_->outfile_str_ = default_out_fn + ".midi"; - - Midi_stream midi_stream (midi_p_->outfile_str_); - *mlog << "MIDI output to " << midi_p_->outfile_str_ << " ..." << endl; - - audio_score_p_->output (midi_stream); - *mlog << endl; -} - -void -Score::paper_output() -{ - if (paper_p_->outfile_str_=="") - paper_p_->outfile_str_ = default_out_fn + ".tex"; - - if ( errorlevel_i_) + if (! iter->ok ()) { - *mlog << "lilypond: warning: no output to: " << paper_p_->outfile_str_ - << " (errorlevel=" << errorlevel_i_ << ")" << endl; - return; + warning (_ ("Need music in a score")); + return SCM_BOOL_F; // todo: should throw exception. } - *mlog << "TeX output to " << paper_p_->outfile_str_ << " ...\n"; - - Tex_stream the_output (paper_p_->outfile_str_); + 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 ())); + - the_output << "% outputting Score, defined at: " << - location_str() << "\n"; - pscore_p_->output (the_output); + return scm_gc_unprotect_object (trans->self_scm ()); } -void -Score::print() const +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.") { -#ifndef NPRINT - DOUT << "score {\n"; - music_p_->print(); - if (midi_p_) - midi_p_->print(); - - DOUT << "}\n"; -#endif + Global_context *g = dynamic_cast (unsmob_context (context)); + SCM_ASSERT_TYPE (g, context, SCM_ARG1, __FUNCTION__, "Global context"); + SCM_ASSERT_TYPE (ly_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)); } void -Score::set (Paper_def *pap_p) +default_rendering (SCM music, SCM outdef, SCM header, SCM outname) { - delete paper_p_; - paper_p_ = pap_p; -} + SCM context = ly_run_translator (music, outdef); -void -Score::set (Midi_def* midi_p) -{ - delete midi_p_; - midi_p_ = midi_p; + if (Global_context *g = dynamic_cast + (unsmob_context (context))) + { + SCM systems = ly_format_output (context, outname); + Music_output *output = g->get_output (); + if (systems != SCM_UNDEFINED) + { + Paper_score *ps = dynamic_cast (output); + + paper_book->papers_.push (ps->paper_); + paper_book->scores_.push (systems); + paper_book->global_headers_.push (global_input_file->header_); + paper_book->headers_.push (header); + if (output_format_global != PAGE_LAYOUT) + paper_book->classic_output (ly_scm2string (outname)); + } + delete output; + } } -