X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=31550fbbe7c9cac93c55e6ed8c355b96de0d7219;hb=958a6362485f6a9bcdd8ca88d034f06877676c33;hp=d8887be29f72d0c1a78cef1bc488dedf4a37eebb;hpb=c380a7abde14a60ebd6d8a6eab91ae4e13677a23;p=lilypond.git diff --git a/lily/score.cc b/lily/score.cc index d8887be29f..31550fbbe7 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -1,192 +1,219 @@ /* - score.cc -- implement Score + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2010 Han-Wen Nienhuys - (c) 1997--2002 Han-Wen Nienhuys -*/ + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. -#include "ly-smobs.icc" + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ #include "score.hh" -#include "debug.hh" -#include "music-output-def.hh" -#include "music-output.hh" -#include "music-iterator.hh" -#include "music.hh" -#include "global-translator.hh" -#include "scm-hash.hh" + +#include + +using namespace std; + +#include "book.hh" #include "cpu-timer.hh" +#include "global-context.hh" +#include "international.hh" +#include "lily-parser.hh" #include "main.hh" -#include "paper-def.hh" +#include "music.hh" +#include "music.hh" +#include "output-def.hh" +#include "paper-book.hh" +#include "paper-score.hh" +#include "warn.hh" +#include "ly-smobs.icc" + +Input * +Score::origin () const +{ + return unsmob_input (input_location_); +} -/* - TODO: junkme. - */ Score::Score () - : Input () { - header_p_ = 0; + header_ = SCM_EOL; music_ = SCM_EOL; - errorlevel_i_ = 0; + input_location_ = SCM_EOL; + + error_found_ = false; smobify_self (); + input_location_ = make_input (Input ()); } -/* - store point & click locations. - Global to save some time. (Sue us!) - */ -bool store_locations_global_b; +Score::~Score () +{ +} -Score::Score (Score const &s) - : Input (s) +IMPLEMENT_SMOBS (Score); +IMPLEMENT_DEFAULT_EQUAL_P (Score); +IMPLEMENT_TYPE_P (Score, "ly:score?"); + +SCM +Score::mark_smob (SCM s) { - music_ = SCM_EOL; - header_p_ = 0; - smobify_self (); + Score *sc = (Score *) SCM_CELL_WORD_1 (s); - 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_mark (sc->header_); + for (vsize i = sc->defs_.size (); i--;) + scm_gc_mark (sc->defs_[i]->self_scm ()); - scm_gc_unprotect_object (header_p_->self_scm ()); - } + scm_gc_mark (sc->input_location_); + return sc->music_; } -Score::~Score () +int +Score::print_smob (SCM, SCM p, scm_print_state*) { - + scm_puts ("#", p); + + return 1; } -void -Score::run_translator (Music_output_def *odef_l) +Score::Score (Score const &s) { - /* - 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_p = odef_l->get_global_translator_p (); - if (!trans_p) + header_ = SCM_EOL; + music_ = 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_); + if (m) { - programming_error ("no toplevel translator"); - return ; + Music *mclone = m->clone (); + music_ = mclone->unprotect (); } - progress_indication (_ ("Interpreting music...")); - Music * music = unsmob_music (music_); - - trans_p->final_mom_ = music->length_mom (); + else + music_ = SCM_EOL; + for (vsize i = 0, n = s.defs_.size (); i < n; i++) + { + Output_def *copy = s.defs_[i]->clone (); + defs_.push_back (copy); + copy->unprotect (); + } + header_ = ly_make_module (false); + if (ly_is_module (s.header_)) + ly_module_copy (header_, s.header_); +} - Music_iterator * iter = Music_iterator::static_get_iterator_p (music); - iter->init_translator (music, trans_p); - iter->construct_children (); +/* + Format score, return list of Music_output objects. - if (! iter->ok ()) - { - delete iter; - warning (_ ("Need music in a score")); - errorlevel_i_ =1; - return ; - } + LAYOUTBOOK should be scaled already. +*/ +SCM +Score::book_rendering (Output_def *layoutbook, + Output_def *default_def) +{ + 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 ("output-scale")); + + SCM outputs = SCM_EOL; + SCM *tail = &outputs; - trans_p->start (); - trans_p->run_iterator_on_me (iter); - delete iter; - trans_p->finish (); + int outdef_count = defs_.size (); - if (errorlevel_i_) + for (int i = 0; !i || i < outdef_count; i++) { - // should we? hampers debugging. - warning (_ ("Errors found/*, not processing score*/")); - } + 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; - 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 ())); + scaled = def->unprotect (); + } - if (!header_p_) - header_p_ = new Scheme_hash_table; // ugh + /* TODO: fix or junk --no-layout. */ + SCM context = ly_run_translator (music_, def->self_scm ()); + if (dynamic_cast (unsmob_context (context))) + { + SCM s = ly_format_output (context); - output->header_l_ = header_p_; - output->origin_str_ = location_str (); + *tail = scm_cons (s, SCM_EOL); + tail = SCM_CDRLOC (*tail); + } - progress_indication ("\n"); - output->process (); - delete output ; + scm_remember_upto_here_1 (scaled); + } - /* - force GC. At this point, GUILE may give back mallocated area to - the system. - */ - - scm_gc (); + scm_remember_upto_here_1 (scaled_bookdef); + return outputs; } void -Score::process () +Score::set_music (SCM music) { - if (!unsmob_music (music_)) - return; - - - for (int i=0; i < def_p_arr_.size (); i++) + if (unsmob_music (music_)) { - if (no_paper_global_b - && dynamic_cast (def_p_arr_[i])) - continue; - run_translator (def_p_arr_[i]); + 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")); + this->error_found_ = this->error_found_ + || to_boolean (m->get_property ("error-found")); + } + if (this->error_found_) + this->music_ = SCM_EOL; + else + this->music_ = music; +} +SCM +Score::get_music () const +{ + return music_; +} void -Score::add_output (Music_output_def *pap_p) +Score::add_output_def (Output_def *def) { - def_p_arr_.push (pap_p); + defs_.push_back (def); } -IMPLEMENT_SMOBS (Score); -IMPLEMENT_DEFAULT_EQUAL_P (Score); - - SCM -Score::mark_smob (SCM s) +Score::get_header () const { - 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_; + return header_; } -int -Score::print_smob (SCM , SCM p, scm_print_state*) +void +Score::set_header (SCM module) { - scm_puts ("#", p); - - return 1; + assert (ly_is_module (module)); + header_ = module; }