X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-engraver.cc;h=94d269df9f2a8819531ba66314555f94bc7e9444;hb=7556e96abb66c88ae653c96898bcad2c3f18b645;hp=f7cba549b26c9e35e1d0e3c39f67e41444ee1ea1;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index f7cba549b2..94d269df9f 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -3,11 +3,10 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ #include "all-font-metrics.hh" -#include "afm.hh" #include "warn.hh" #include "main.hh" #include "system.hh" @@ -17,78 +16,39 @@ #include "output-def.hh" #include "axis-group-interface.hh" #include "context-def.hh" -#include "staff-spacing.hh" -#include "note-spacing.hh" #include "global-context.hh" #include "open-type-font.hh" +#include "paper-column-engraver.hh" -/* - TODO: the column creation logic is rather hairy. Revise it. -*/ Score_engraver::Score_engraver () { system_ = 0; - command_column_ = 0; - musical_column_ = 0; - breaks_ = 0; pscore_ = 0; } void -Score_engraver::make_columns () +Score_engraver::derived_mark () const { - /* - ugh. - */ - if (!command_column_) - { - SCM nmp - = updated_grob_properties (context (), - ly_symbol2scm ("NonMusicalPaperColumn")); - - Object_key const *key1 = context ()->get_grob_key ("NonMusicalPaperColumn"); - - SCM pc = updated_grob_properties (context (), - ly_symbol2scm ("PaperColumn")); - Object_key const *key2 = context ()->get_grob_key ("PaperColumn"); - set_columns (new Paper_column (nmp, key1), new Paper_column (pc, key2)); - - Grob_info i1; - i1.grob_ = command_column_; - i1.origin_trans_ = this; - - announce_grob (i1); - - Grob_info i2; - i2.grob_ = musical_column_; - i2.origin_trans_ = this; - - announce_grob (i2); - } + if (pscore_) + scm_gc_mark (pscore_->self_scm ()); + Score_translator::derived_mark (); + Engraver_group::derived_mark (); } void Score_engraver::prepare (Moment m) { - /* - TODO: don't make columns when skipTypesetting is true. - */ - make_columns (); + (void) m; - SCM w = m.smobbed_copy (); - command_column_->set_property ("when", w); - musical_column_->set_property ("when", w); - - recurse_over_translators (context (), &Translator::start_translation_timestep, DOWN); + precomputed_recurse_over_translators (context (), START_TRANSLATION_TIMESTEP, DOWN); } void Score_engraver::finish () { - if ((breaks_ % 8)) - progress_indication ("[" + to_string (breaks_) + "]"); - - recurse_over_translators (context (), &Translator::finalize, UP); + recurse_over_translators (context (), &Translator::finalize, + &Translator_group::finalize, + UP); } #define MUSIC_FONT "emmentaler-20" @@ -106,25 +66,23 @@ Score_engraver::initialize () + "\n" + _ ("Music font has not been installed properly.") + "\n" - + _f ("Search path `%s'", global_path.to_string ().to_str0 ()) + + _f ("Search path `%s'", global_path.to_string ().c_str ()) + "\n" + _ ("Aborting")); } - pscore_ = new Paper_score; - pscore_->layout_ = dynamic_cast (get_output_def ()); + pscore_ = new Paper_score (dynamic_cast (context ()->get_output_def ())); + pscore_->unprotect (); SCM props = updated_grob_properties (context (), ly_symbol2scm ("System")); Object_key const *sys_key = context ()->get_grob_key ("System"); - pscore_->typeset_line (new System (props, sys_key)); + pscore_->typeset_system (new System (props, sys_key)); + + system_ = pscore_->root_system (); + context ()->set_property ("rootSystem", system_->self_scm ()); - system_ = pscore_->system_; - make_columns (); - system_->set_bound (LEFT, command_column_); - command_column_->set_property ("breakable", SCM_BOOL_T); - - Engraver_group_engraver::initialize (); + Engraver_group::initialize (); } void @@ -132,32 +90,28 @@ Score_engraver::finalize () { Score_translator::finalize (); - Grob *cc - = unsmob_grob (get_property ("currentCommandColumn")); - system_->set_bound (RIGHT, cc); - cc->set_property ("breakable", SCM_BOOL_T); - typeset_all (); } void Score_engraver::one_time_step () { - if (!to_boolean (get_property ("skipTypesetting"))) + if (!to_boolean (context ()->get_property ("skipTypesetting"))) { - recurse_over_translators (context (), &Engraver::process_music, UP); - Engraver_group_engraver::do_announces (); + precomputed_recurse_over_translators (context (), PROCESS_MUSIC, UP); + Engraver_group::do_announces (); } - recurse_over_translators (context (), &Translator::stop_translation_timestep, UP); + precomputed_recurse_over_translators (context (), STOP_TRANSLATION_TIMESTEP, UP); + typeset_all (); } void Score_engraver::announce_grob (Grob_info info) { announce_infos_.push (info); - pscore_->system_->typeset_grob (info.grob_); - elems_.push (info.grob_); + pscore_->root_system ()->typeset_grob (info.grob ()); + elems_.push (info.grob ()); } void @@ -167,156 +121,59 @@ Score_engraver::typeset_all () { Grob *elem = elems_[i]; - if (dynamic_cast (elem)) - { - if ((!elem->get_parent (X_AXIS) - || !unsmob_grob (elem->get_property ("axis-group-parent-X"))) - && elem != command_column_ - && elem != musical_column_) - { - bool br = to_boolean (elem->get_property ("breakable")); - Axis_group_interface::add_element (br ? command_column_ : musical_column_, elem); - - } - } if (!elem->get_parent (Y_AXIS)) Axis_group_interface::add_element (system_, elem); } elems_.clear (); } -void -Score_engraver::stop_translation_timestep () +SCM +Score_engraver::get_output () { - // this generates all items. - Engraver_group_engraver::stop_translation_timestep (); - - typeset_all (); - if (to_boolean (command_column_->get_property ("breakable"))) - { - breaks_++; - if (! (breaks_%8)) - progress_indication ("[" + to_string (breaks_) + "]"); - } - - command_column_ = 0; - musical_column_ = 0; + Music_output *o = pscore_; + return o->self_scm (); } +/* + UGH UGH +*/ void -Score_engraver::set_columns (Paper_column *new_command, - Paper_column *new_musical) +Score_engraver::forbid_breaks () { - assert (!command_column_ && !musical_column_); - - command_column_ = new_command; - musical_column_ = new_musical; - if (new_command) - { - context ()->set_property ("currentCommandColumn", new_command->self_scm ()); - } - - if (new_musical) + for (SCM s = simple_trans_list_; scm_is_pair (s); s = scm_cdr (s)) { - context ()->set_property ("currentMusicalColumn", new_musical->self_scm ()); + Translator *tr = unsmob_translator (scm_car (s)); + if (Paper_column_engraver *pce = dynamic_cast (tr)) + pce->forbid_breaks (); } - - system_->add_column (command_column_); - system_->add_column (musical_column_); -} - -Music_output * -Score_engraver::get_output () -{ - Music_output *o = pscore_; - ///FIXME WTF? pscore_ = 0; - return o; } bool Score_engraver::try_music (Music *m) { - if (Engraver_group_engraver::try_music (m)) + if (Engraver_group::try_music (m)) return true; - if (m->is_mus_type ("break-event")) - { - SCM pen = command_column_->get_property ("penalty"); - Real total_penalty = scm_is_number (pen) ? scm_to_double (pen) : 0.0; - - SCM mpen = m->get_property ("penalty"); - if (scm_is_number (mpen)) - total_penalty += scm_to_double (mpen); - - command_column_->set_property ("penalty", scm_make_real (total_penalty)); - - /* ugh. arbitrary, hardcoded */ - if (total_penalty > 10000.0) - forbid_breaks (); - - SCM page_pen = command_column_->get_property ("page-penalty"); - Real total_pp = scm_is_number (page_pen) ? scm_to_double (page_pen) : 0.0; - SCM mpage_pen = m->get_property ("page-penalty"); - if (scm_is_number (mpage_pen)) - total_pp += scm_to_double (mpage_pen); - - command_column_->set_property ("page-penalty", scm_make_real (total_pp)); - return true; - } return false; } -void -Score_engraver::forbid_breaks () -{ - if (command_column_) - command_column_->set_property ("breakable", SCM_EOL); -} - -void -Score_engraver::acknowledge_grob (Grob_info gi) -{ - if (Staff_spacing::has_interface (gi.grob_)) - { - Pointer_group_interface::add_grob (command_column_, - ly_symbol2scm ("spacing-wishes"), - gi.grob_); - } - if (Note_spacing::has_interface (gi.grob_)) - { - Pointer_group_interface::add_grob (musical_column_, - ly_symbol2scm ("spacing-wishes"), - gi.grob_); - } - - if (Axis_group_interface::has_interface (gi.grob_) - && gi.grob_->internal_has_interface (ly_symbol2scm ("vertically-spaceable-interface"))) - { - SCM spaceable = get_property ("verticallySpacedContexts"); - Context *orig = gi.origin_contexts (this)[0]; - - if (scm_memq (ly_symbol2scm (orig->context_name ().to_str0 ()), - spaceable) != SCM_BOOL_F) - { - Pointer_group_interface::add_grob (system_, - ly_symbol2scm ("spaceable-staves"), - gi.grob_); - } - } - -} - -ADD_TRANSLATOR (Score_engraver, - /* descr */ "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.) ", - /* creats*/ "System PaperColumn NonMusicalPaperColumn", - /* accepts */ "break-event", - /* acks */ "note-spacing-interface staff-spacing-interface axis-group-interface", - /* reads */ "currentMusicalColumn currentCommandColumn verticallySpacedContexts", - /* write */ ""); +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.) ", + /* create */ + "System ", + + /* accept */ + "break-event", + /* read */ + "currentMusicalColumn " + "currentCommandColumn " + "verticallySpacedContexts", + /* write */ + "");