X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=1f26b8473b46de1d25165dd2812a96e39182a418;hb=10845c628c111c6afcf4eb39c3960ee552b95ab9;hp=ccb5b2b95dd85329a9f25126cee2e222af9e2db9;hpb=051d7e7cbdbbe5f5337ab2b477b0bd1e72eedd04;p=lilypond.git diff --git a/lily/score.cc b/lily/score.cc index ccb5b2b95d..1f26b8473b 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -1,182 +1,213 @@ /* - 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--2014 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 + 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. -#include "ly-smobs.icc" + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ #include "score.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 "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 "ly-modules.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 () { - input_file_ = 0; header_ = SCM_EOL; music_ = SCM_EOL; - errorlevel_ = 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_ = 0; - smobify_self (); + Score *sc = (Score *) SCM_CELL_WORD_1 (s); + + scm_gc_mark (sc->header_); + for (vsize i = sc->defs_.size (); i--;) + scm_gc_mark (sc->defs_[i]->self_scm ()); - 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++) - defs_.push (s.defs_[i]->clone ()); - errorlevel_ = s.errorlevel_; - - header_ = ly_make_anonymous_module (); - if (ly_module_p (s.header_)) - ly_copy_module_variables (header_, s.header_); + 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; } +Score::Score (Score const &s) +{ + header_ = SCM_EOL; + music_ = SCM_EOL; + input_location_ = SCM_EOL; + error_found_ = s.error_found_; + smobify_self (); + input_location_ = make_input (*s.origin ()); -void -Score::run_translator (Music_output_def *odef) -{ - /* - 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 = odef->get_global_translator (); - if (!trans) + 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->final_mom_ = music->get_length (); - SCM protected_iter = Music_iterator::get_static_get_iterator (music); - Music_iterator * iter = unsmob_iterator (protected_iter); - iter->init_translator (music, trans); + else + music_ = SCM_EOL; - iter->construct_children (); - - if (! iter->ok ()) + for (vsize i = 0, n = s.defs_.size (); i < n; i++) { - warning (_ ("Need music in a score")); - errorlevel_ =1; - return ; + 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_); +} + +/* + Format score, return list of Music_output objects. + + LAYOUTBOOK should be scaled already. +*/ +SCM +Score::book_rendering (Output_def *layoutbook, + Output_def *default_def) +{ + if (error_found_) + return 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")); - trans->start (); - trans->run_iterator_on_me (iter); - iter->quit(); - scm_remember_upto_here_1 (protected_iter); - trans->finish (); + SCM outputs = SCM_EOL; - if (errorlevel_) + int outdef_count = defs_.size (); + + 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 = def->self_scm (); - Music_output * output = trans->get_output (); - scm_gc_unprotect_object (trans->self_scm ()); - - if (verbose_global_b) - progress_indication (_f ("elapsed time: %.2f seconds", timer.read ())); + if (def->c_variable ("is-layout") == SCM_BOOL_T) + { + def = scale_output_def (def, scale); + def->parent_ = layoutbook; - if (!header_) - header_ = ly_make_anonymous_module(); // ug.h + scaled = def->unprotect (); + } - output->header_ = header_; - output->origin_string_ = location_string (); + /* TODO: fix or junk --no-layout. */ + SCM context = ly_run_translator (music_, scaled); + if (dynamic_cast (unsmob_context (context))) + { + SCM s = ly_format_output (context); - progress_indication ("\n"); - output->process (); - - delete output ; + outputs = scm_cons (s, outputs); + } + + scm_remember_upto_here_1 (scaled); + } + + return scm_reverse_x (outputs, SCM_EOL); } void -Score::process () +Score::set_music (SCM music) { - if (!unsmob_music (music_)) - return; - - for (int i=0; i < defs_.size (); i++) + 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"))) { - if (no_paper_global_b - && dynamic_cast (defs_[i])) - continue; - run_translator (defs_[i]); + 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) +Score::add_output_def (Output_def *def) { - defs_.push (pap); + 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); - - scm_gc_mark (sc->header_); - for (int i = sc->defs_.size (); i--;) - scm_gc_mark (sc->defs_[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; }