X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=d10023dd8506b5103bed7a09ef673a074cff8574;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=b5898a560323670770394296762c6aefa72009fa;hpb=b99527c715a0e20f0ba3d87ce68a84ad8df9e04c;p=lilypond.git diff --git a/lily/score.cc b/lily/score.cc index b5898a5603..d10023dd85 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -1,21 +1,34 @@ /* - 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--2015 Han-Wen Nienhuys - (c) 1997--2005 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. + + 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 + using namespace std; #include "book.hh" #include "cpu-timer.hh" #include "global-context.hh" +#include "international.hh" #include "lily-parser.hh" -#include "lilypond-key.hh" +#include "ly-module.hh" #include "main.hh" #include "music.hh" #include "output-def.hh" @@ -23,54 +36,54 @@ using namespace std; #include "paper-score.hh" #include "warn.hh" -#include "music.hh" -#include "ly-smobs.icc" + +Input * +Score::origin () const +{ + return unsmob (input_location_); +} Score::Score () - : Input () { header_ = SCM_EOL; music_ = SCM_EOL; + input_location_ = SCM_EOL; + error_found_ = false; + smobify_self (); + input_location_ = Input ().smobbed_copy (); } Score::~Score () { } -IMPLEMENT_SMOBS (Score); -IMPLEMENT_DEFAULT_EQUAL_P (Score); -IMPLEMENT_TYPE_P (Score, "ly:score?"); +const char * const Score::type_p_name_ = "ly:score?"; SCM -Score::mark_smob (SCM s) -{ - 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_; -} - -int -Score::print_smob (SCM, SCM p, scm_print_state*) +Score::mark_smob () const { - scm_puts ("#", p); + scm_gc_mark (header_); + for (vsize i = defs_.size (); i--;) + scm_gc_mark (defs_[i]->self_scm ()); - return 1; + scm_gc_mark (input_location_); + return music_; } Score::Score (Score const &s) - : Input (s) + : Smob () { header_ = SCM_EOL; music_ = SCM_EOL; + input_location_ = SCM_EOL; error_found_ = s.error_found_; + smobify_self (); + input_location_ = s.origin ()->smobbed_copy (); - Music *m = unsmob_music (s.music_); + Music *m = unsmob (s.music_); if (m) { Music *mclone = m->clone (); @@ -79,72 +92,17 @@ Score::Score (Score const &s) else music_ = SCM_EOL; - for (int i = 0, n = s.defs_.size (); i < n; i++) + for (vsize i = 0, n = s.defs_.size (); i < n; i++) { Output_def *copy = s.defs_[i]->clone (); - defs_.push (copy); + defs_.push_back (copy); copy->unprotect (); } - header_ = ly_make_anonymous_module (false); + header_ = ly_make_module (false); if (ly_is_module (s.header_)) ly_module_copy (header_, s.header_); } -void -default_rendering (SCM music, SCM outdef, - SCM book_outputdef, - 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-paper") == SCM_BOOL_T) - { - Real scale = scm_to_double (bpd->c_variable ("outputscale")); - - Output_def *def = scale_output_def (unsmob_output_def (outdef), scale); - Output_def *bdef = scale_output_def (bpd, scale); - def->parent_ = bdef; - - scaled_def = def->self_scm (); - scaled_bookdef = bdef->self_scm (); - - def->unprotect (); - bdef->unprotect (); - } - - SCM context = ly_run_translator (music, scaled_def, key); - - SCM output_as_scm = ly_format_output (context); - Music_output *output = unsmob_music_output (output_as_scm); - - if (Paper_score *pscore = dynamic_cast (output)) - { - /* 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); - - if (ly_is_module (header)) - paper_book->add_score (header); - - SCM systems = pscore->get_paper_systems (); - paper_book->add_score (systems); - - paper_book->classic_output (outname); - paper_book->unprotect (); - } - - scm_remember_upto_here_1 (scaled_def); - scm_remember_upto_here_1 (output_as_scm); - scm_remember_upto_here_1 (scaled_bookdef); -} - /* Format score, return list of Music_output objects. @@ -152,78 +110,71 @@ default_rendering (SCM music, SCM outdef, */ SCM Score::book_rendering (Output_def *layoutbook, - Output_def *default_def, - Object_key *book_key) + 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 ("outputscale")); + if (layoutbook && to_boolean (layoutbook->c_variable ("is-paper"))) + scale = scm_to_double (layoutbook->c_variable ("output-scale")); SCM outputs = SCM_EOL; - SCM *tail = &outputs; int outdef_count = defs_.size (); - Object_key *key = new Lilypond_general_key (book_key, user_key_, 0); - SCM scm_key = key->unprotect (); - for (int i = 0; !i || i < outdef_count; i++) { Output_def *def = outdef_count ? defs_[i] : default_def; - SCM scaled = SCM_EOL; + SCM scaled = def->self_scm (); - if (def->c_variable ("is-layout") == SCM_BOOL_T) - { - def = scale_output_def (def, scale); - def->parent_ = layoutbook; + if (to_boolean (def->c_variable ("is-layout"))) + { + def = scale_output_def (def, scale); + def->parent_ = layoutbook; - scaled = def->unprotect (); - } + scaled = def->unprotect (); + } /* 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); + SCM context = ly_run_translator (music_, scaled); + if (unsmob (context)) + { + SCM s = ly_format_output (context); - *tail = scm_cons (s, SCM_EOL); - tail = SCM_CDRLOC (*tail); - } + outputs = scm_cons (s, outputs); + } scm_remember_upto_here_1 (scaled); } - scm_remember_upto_here_1 (scm_key); - scm_remember_upto_here_1 (scaled_bookdef); - return outputs; + return scm_reverse_x (outputs, SCM_EOL); } void Score::set_music (SCM music) { - if (unsmob_music (music_)) + if (unsmob (music_)) { - unsmob_music (music)->origin ()->error (_ ("already have music in score")); - unsmob_music (music_)->origin ()->error (_ ("this is the previous music")); + unsmob (music)->origin ()->non_fatal_error + (_ ("already have music in score")); + unsmob (music_)->origin ()->non_fatal_error + (_ ("this is the previous music")); } - Music *m = unsmob_music (music); + Music *m = unsmob (music); if (m && to_boolean (m->get_property ("error-found"))) { - m->origin ()->error (_ ("errors found, ignoring music expression")); + m->origin ()->non_fatal_error + (_ ("errors found, ignoring music expression")); - this->error_found_ = this->error_found_ - || to_boolean (m->get_property ("error-found")); + error_found_ = true; } - if (this->error_found_) - this->music_ = SCM_EOL; + if (error_found_) + music_ = SCM_EOL; else - this->music_ = music; + music_ = music; } SCM @@ -231,3 +182,22 @@ Score::get_music () const { return music_; } + +void +Score::add_output_def (Output_def *def) +{ + defs_.push_back (def); +} + +SCM +Score::get_header () const +{ + return header_; +} + +void +Score::set_header (SCM module) +{ + assert (ly_is_module (module)); + header_ = module; +}