X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-engraver.cc;h=5fea2032105a7121880b626f3506fe01af051764;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=e45a99676c1b063514d7e281fe3624ec62da5b71;hpb=d24e58ca5b51877dff138fad2383470707b51a0d;p=lilypond.git diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index e45a99676c..5fea203210 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -3,22 +3,25 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2006 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ -#include "all-font-metrics.hh" -#include "warn.hh" -#include "main.hh" -#include "system.hh" #include "score-engraver.hh" -#include "paper-score.hh" -#include "paper-column.hh" -#include "output-def.hh" + +#include "all-font-metrics.hh" #include "axis-group-interface.hh" #include "context-def.hh" +#include "dispatcher.hh" #include "global-context.hh" +#include "international.hh" +#include "main.hh" #include "open-type-font.hh" +#include "output-def.hh" #include "paper-column-engraver.hh" +#include "paper-column.hh" +#include "paper-score.hh" +#include "system.hh" +#include "warn.hh" Score_engraver::Score_engraver () { @@ -31,20 +34,19 @@ Score_engraver::derived_mark () const { if (pscore_) scm_gc_mark (pscore_->self_scm ()); - Score_translator::derived_mark (); Engraver_group::derived_mark (); } +IMPLEMENT_LISTENER (Score_engraver, prepare); void -Score_engraver::prepare (Moment m) +Score_engraver::prepare (SCM) { - (void) m; - precomputed_recurse_over_translators (context (), START_TRANSLATION_TIMESTEP, DOWN); } +IMPLEMENT_LISTENER (Score_engraver, finish); void -Score_engraver::finish () +Score_engraver::finish (SCM) { recurse_over_translators (context (), &Translator::finalize, &Translator_group::finalize, @@ -73,27 +75,65 @@ Score_engraver::initialize () 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 ()); Engraver_group::initialize (); } +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 () +{ + Dispatcher *d = context ()->get_global_context ()->event_source (); + d->remove_listener (GET_LISTENER (one_time_step), ly_symbol2scm ("OneTimeStep")); + d->remove_listener (GET_LISTENER (prepare), ly_symbol2scm ("Prepare")); + d->remove_listener (GET_LISTENER (finish), ly_symbol2scm ("Finish")); + + Engraver_group::disconnect_from_context (); +} + void Score_engraver::finalize () { - Score_translator::finalize (); + Engraver_group::finalize (); typeset_all (); } +IMPLEMENT_LISTENER (Score_engraver, one_time_step); void -Score_engraver::one_time_step () +Score_engraver::one_time_step (SCM) { if (!to_boolean (context ()->get_property ("skipTypesetting"))) { @@ -108,15 +148,18 @@ Score_engraver::one_time_step () void Score_engraver::announce_grob (Grob_info info) { - announce_infos_.push (info); - pscore_->root_system ()->typeset_grob (info.grob ()); - elems_.push (info.grob ()); + Engraver_group::announce_grob (info); + if (info.start_end () == START) + { + pscore_->root_system ()->typeset_grob (info.grob ()); + elems_.push_back (info.grob ()); + } } void Score_engraver::typeset_all () { - for (int i = 0; i < elems_.size (); i++) + for (vsize i = 0; i < elems_.size (); i++) { Grob *elem = elems_[i]; @@ -126,53 +169,29 @@ Score_engraver::typeset_all () elems_.clear (); } -SCM -Score_engraver::get_output () -{ - Music_output *o = pscore_; - return o->self_scm (); -} - -/* - UGH UGH -*/ -void -Score_engraver::forbid_breaks () -{ - for (SCM s = simple_trans_list_; scm_is_pair (s); s = scm_cdr (s)) - { - Translator *tr = unsmob_translator (scm_car (s)); - if (Paper_column_engraver *pce = dynamic_cast (tr)) - pce->forbid_breaks (); - } -} - -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, when every Bar_engraver " - "that does not have a barline at a certain point will call " - "Score_engraver::forbid_breaks 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.) ", + /* 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 ", - - /* accept */ - "break-event", + /* read */ "currentMusicalColumn " "currentCommandColumn " - "verticallySpacedContexts", + "verticallySpacedContexts ", + /* write */ - ""); + "" + );