X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-engraver.cc;h=e0bca498f753b81727e5276a3f7615a6f320491d;hb=b7d54752c51584d7df85a24a2b29b9a527f9ff4c;hp=b6c79d01588f57eeff3980742f534a1c8253d2fb;hpb=862601226f319d2395794fe1175e7f17485b8e19;p=lilypond.git diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index b6c79d0158..e0bca498f7 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -1,9 +1,20 @@ /* - score-engraver.cc -- implement Score_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2012 Han-Wen Nienhuys - (c) 1997--2006 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-engraver.hh" @@ -20,7 +31,6 @@ #include "paper-column-engraver.hh" #include "paper-column.hh" #include "paper-score.hh" -#include "stream-event.hh" #include "system.hh" #include "warn.hh" @@ -35,7 +45,6 @@ Score_engraver::derived_mark () const { if (pscore_) scm_gc_mark (pscore_->self_scm ()); - Score_translator::derived_mark (); Engraver_group::derived_mark (); } @@ -51,8 +60,8 @@ void Score_engraver::finish (SCM) { recurse_over_translators (context (), &Translator::finalize, - &Translator_group::finalize, - UP); + &Translator_group::finalize, + UP); } #define MUSIC_FONT "emmentaler-20" @@ -67,22 +76,22 @@ Score_engraver::initialize () if (!fm) { error (_f ("cannot find `%s'", MUSIC_FONT ".otf") - + "\n" - + _ ("Music font has not been installed properly.") - + "\n" - + _f ("Search path `%s'", global_path.to_string ().c_str ()) - + "\n" - + _ ("Aborting")); + + "\n" + + _ ("Music font has not been installed properly.") + + "\n" + + _f ("Search path `%s'", global_path.to_string ().c_str ()) + + "\n" + + _ ("Aborting")); } pscore_ = new Paper_score (dynamic_cast (context ()->get_output_def ())); pscore_->unprotect (); + context ()->set_property ("output", pscore_->self_scm ()); SCM props = updated_grob_properties (context (), ly_symbol2scm ("System")); - Object_key const *sys_key = context ()->get_grob_key ("System"); - pscore_->typeset_system (new System (props, sys_key)); - + pscore_->typeset_system (new System (props)); + system_ = pscore_->root_system (); context ()->set_property ("rootSystem", system_->self_scm ()); @@ -93,13 +102,27 @@ void Score_engraver::connect_to_context (Context *c) { Engraver_group::connect_to_context (c); - + Dispatcher *d = c->get_global_context ()->event_source (); d->add_listener (GET_LISTENER (one_time_step), ly_symbol2scm ("OneTimeStep")); d->add_listener (GET_LISTENER (prepare), ly_symbol2scm ("Prepare")); d->add_listener (GET_LISTENER (finish), ly_symbol2scm ("Finish")); } +/* + uncovered: + + check_removal always returns false for Score contexts, it has been that way +since I joined the project. There is a reason for this: The typeset score is +stored in the Score_engraver, which in turn is accessed through the +Global_context returned by ly:run-translator. So the score-translator must be +connected to the score-context after run-translator finishes. + +I plan to change this: we should junk run-translator, and instead keep track +of both context and translator in the SCM code, and access the typeset score +directly via the created global-translator. Then it would be possible to +disconnect score-translators at iteration time. -es + */ void Score_engraver::disconnect_from_context () { @@ -114,12 +137,12 @@ Score_engraver::disconnect_from_context () void Score_engraver::finalize () { - Score_translator::finalize (); + Engraver_group::finalize (); typeset_all (); } -IMPLEMENT_LISTENER(Score_engraver, one_time_step); +IMPLEMENT_LISTENER (Score_engraver, one_time_step); void Score_engraver::one_time_step (SCM) { @@ -152,46 +175,33 @@ Score_engraver::typeset_all () Grob *elem = elems_[i]; if (!elem->get_parent (Y_AXIS)) - Axis_group_interface::add_element (system_, elem); + Axis_group_interface::add_element (system_, elem); } elems_.clear (); } -SCM -Score_engraver::get_output () -{ - Music_output *o = pscore_; - return o->self_scm (); -} - -bool -Score_engraver::try_music (Music *m) -{ - if (Engraver_group::try_music (m)) - return true; - - return false; -} - ADD_TRANSLATOR_GROUP (Score_engraver, - /* doc */ "Top level engraver. Takes care of generating columns and the complete system (ie. System) " - "\n\n " - "This engraver decides whether a column is breakable. The default is " - "that a column is always breakable. However, every Bar_engraver " - "that does not have a barline at a certain point will set " - "forbidBreaks to stop linebreaks. In practice, this " - "means that you can make a breakpoint by creating a barline (assuming " - "that there are no beams or notes that prevent a breakpoint.) ", - /* create */ - "System ", - - /* accept */ - "break-event", - - /* read */ - "currentMusicalColumn " - "currentCommandColumn " - "verticallySpacedContexts", - - /* write */ - ""); + /* doc */ + "The top-level engraver. Takes care of generating" + " columns and the complete system (i.e.," + " @code{System}).\n" + "\n" + "This engraver decides whether a column is breakable." + " The default is that a column is always breakable." + " However, every @code{Bar_engraver} that does not have" + " a bar line at a certain point sets @code{forbidBreaks}" + " to stop line breaks. In practice, this means that you" + " can make a break point by creating a bar line" + " (assuming that there are no beams or notes that" + " prevent a break point).", + + /* create */ + "System ", + + /* read */ + "currentMusicalColumn " + "currentCommandColumn ", + + /* write */ + "" + );