X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-engraver.cc;h=7d44b9495ac0309fa90dfc518c3710b3a294e992;hb=b55303a78f027962dbebf62dbe396325f3b6e1a5;hp=5f39102e276c38366a44efbf9bcc1fa7cd5f9b0f;hpb=0119396bf047bbc0a6debd06f48e6d18573e2303;p=lilypond.git diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index 5f39102e27..7d44b9495a 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -3,12 +3,12 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "debug.hh" -#include "line-of-score.hh" +#include "system.hh" #include "item.hh" #include "score-engraver.hh" #include "paper-score.hh" @@ -18,8 +18,13 @@ #include "axis-group-interface.hh" #include "translator-def.hh" +#include "staff-spacing.hh" +#include "note-spacing.hh" -Score_engraver::Score_engraver() +/* + TODO: the column creation logic is rather hairy. Revise it. + */ +Score_engraver::Score_engraver () { scoreline_l_ =0; command_column_l_ =0; @@ -29,25 +34,24 @@ Score_engraver::Score_engraver() } void -Score_engraver::make_columns (Moment w) +Score_engraver::make_columns () { /* ugh. */ - if (!command_column_l_ - || *unsmob_moment (command_column_l_->get_grob_property ("when")) != w) + if (!command_column_l_) { - set_columns (new Paper_column (get_property (ly_symbol2scm ("NonMusicalPaperColumn"))), - new Paper_column (get_property (ly_symbol2scm ("PaperColumn")))); + set_columns (new Paper_column (get_property ("NonMusicalPaperColumn")), + new Paper_column (get_property ("PaperColumn"))); - command_column_l_->set_grob_property ("when", w.smobbed_copy()); - musical_column_l_->set_grob_property ("when", w.smobbed_copy()); command_column_l_->set_grob_property ("breakable", SCM_BOOL_T); - Grob_info i1(command_column_l_, 0), i2 (musical_column_l_,0); - + Grob_info i1 (command_column_l_); i1.origin_trans_l_ = this; + + Grob_info i2 (musical_column_l_); i2.origin_trans_l_ = this; + announce_grob (i1); announce_grob (i2); } @@ -57,19 +61,20 @@ void Score_engraver::prepare (Moment w) { Global_translator::prepare (w); - make_columns (w); - post_move_processing(); + make_columns (); + start_translation_timestep (); } void -Score_engraver::finish() +Score_engraver::finish () { if ((breaks_i_%8)) - progress_indication ("[" + to_str ( breaks_i_) + "]"); + progress_indication ("[" + to_str (breaks_i_) + "]"); - check_removal(); - removal_processing(); + check_removal (); + removal_processing (); + } /* @@ -83,65 +88,54 @@ Score_engraver::initialize () assert (dynamic_cast (output_def_l_)); assert (!daddy_trans_l_); pscore_p_ = new Paper_score; - pscore_p_->paper_l_ = dynamic_cast(output_def_l_); + pscore_p_->paper_l_ = dynamic_cast (output_def_l_); - SCM props = get_property (ly_symbol2scm ("LineOfScore")); + SCM props = get_property ("System"); - pscore_p_->typeset_line (new Line_of_score (props)); + pscore_p_->typeset_line (new System (props)); - make_columns (Moment (0)); + make_columns (); scoreline_l_ = pscore_p_->line_l_; - - scoreline_l_->set_bound(LEFT, command_column_l_); - + scoreline_l_->set_bound (LEFT, command_column_l_); command_column_l_->set_grob_property ("breakable", SCM_BOOL_T); - Engraver_group_engraver::initialize(); + Engraver_group_engraver::initialize (); } void -Score_engraver::finalize() +Score_engraver::finalize () { - Engraver_group_engraver::finalize(); - scoreline_l_->set_bound(RIGHT,command_column_l_); - command_column_l_->set_grob_property ("breakable", SCM_BOOL_T); + Engraver_group_engraver::finalize (); + + Grob * cc + = unsmob_grob (get_property ("currentCommandColumn")); + scoreline_l_->set_bound (RIGHT, cc); + cc->set_grob_property ("breakable", SCM_BOOL_T); typeset_all (); - - set_columns (0,0); } void -Score_engraver::one_time_step() +Score_engraver::one_time_step () { - process_music(); - announces(); - pre_move_processing(); - check_removal(); + if (!to_boolean (get_property ("skipTypesetting"))) + { + process_music (); + announces (); + } + + stop_translation_timestep (); + check_removal (); } void Score_engraver::announce_grob (Grob_info info) { announce_info_arr_.push (info); - pscore_p_->line_l_->typeset_grob (info.elem_l_); -} + pscore_p_->line_l_->typeset_grob (info.grob_l_); + -/* All elements are propagated to the top upon announcement. If - something was created during one run of - Engraver_group_engraver::do_announces, then - announce_info_arr_.size() will be nonzero again -*/ -/* junkme? Done by Engraver_group_engraver::do_announces ()? - */ - -void -Score_engraver::do_announces() -{ - ////// do - Engraver_group_engraver::do_announces(); - //////while (announce_info_arr_.size()); } @@ -157,9 +151,9 @@ Score_engraver::typeset_grob (Grob *elem_p) void -Score_engraver::typeset_all() +Score_engraver::typeset_all () { - for (int i =0; i < elem_p_arr_.size(); i++) + for (int i =0; i < elem_p_arr_.size (); i++) { Grob * elem_p = elem_p_arr_[i]; @@ -173,64 +167,64 @@ Score_engraver::typeset_all() do { if (!s->get_bound (d)) { - s->set_bound(d, command_column_l_); + s->set_bound (d, command_column_l_); /* don't warn for empty/suicided spanners, it makes real warningsinvisible. maybe should be junked earlier? */ if (elem_p->immutable_property_alist_ == SCM_EOL) ; // gdb hook else - ::warning (_f ("unbound spanner `%s'", s->name ().ch_C ())); + elem_p->warning (_f ("unbound spanner `%s'", s->name ().ch_C ())); } } while (flip (&d) != LEFT); } else { - if (!elem_p->parent_l (X_AXIS)) + if (!elem_p->get_parent (X_AXIS)) { bool br = to_boolean (elem_p->get_grob_property ("breakable")); Axis_group_interface::add_element (br ? command_column_l_ : musical_column_l_, elem_p); } } - if (!elem_p->parent_l(Y_AXIS)) + if (!elem_p->get_parent (Y_AXIS)) Axis_group_interface::add_element (scoreline_l_, elem_p); } - elem_p_arr_.clear(); + elem_p_arr_.clear (); } void -Score_engraver::stop_translation_timestep() +Score_engraver::stop_translation_timestep () { // this generates all items. - Engraver_group_engraver::stop_translation_timestep(); + Engraver_group_engraver::stop_translation_timestep (); - typeset_all(); + typeset_all (); if (to_boolean (command_column_l_->get_grob_property ("breakable"))) { breaks_i_ ++; if (! (breaks_i_%8)) - progress_indication ("[" + to_str ( breaks_i_) + "]"); + progress_indication ("[" + to_str (breaks_i_) + "]"); } + + command_column_l_->set_grob_property ("when", now_mom_.smobbed_copy ()); + musical_column_l_->set_grob_property ("when", now_mom_.smobbed_copy ()); + + scoreline_l_->add_column (command_column_l_); + scoreline_l_->add_column (musical_column_l_); + + command_column_l_ = 0; + musical_column_l_ = 0; } void Score_engraver::set_columns (Paper_column *new_command_l, Paper_column *new_musical_l) { - Paper_column * news[] = {new_command_l, new_musical_l}; - Paper_column **current[] = {&command_column_l_, &musical_column_l_}; - - for (int i=00; i< 2; i++) - { - if (*current[i]) - { - scoreline_l_->add_column ((*current[i])); - } - if (news[i]) - *current[i] = news[i]; - } - + assert (!command_column_l_ && !musical_column_l_); + command_column_l_ = new_command_l; + musical_column_l_ = new_musical_l; + if (new_musical_l) set_property ("currentMusicalColumn", new_musical_l->self_scm ()); if (new_command_l) @@ -257,9 +251,9 @@ Score_engraver::try_music (Music*r) gotcha = true; - SCM pen = command_column_l_->get_grob_property ("penalty"); + SCM pen = command_column_l_->get_grob_property ("penalty"); Real total_penalty = gh_number_p (pen) - ? gh_scm2double(pen) + ? gh_scm2double (pen) : 0.0; SCM rpen = b->get_mus_property ("penalty"); @@ -279,7 +273,6 @@ Score_engraver::try_music (Music*r) /* TODO: use property Score.breakForbidden = #t */ - void Score_engraver::forbid_breaks () { @@ -288,7 +281,40 @@ Score_engraver::forbid_breaks () */ command_column_l_->remove_grob_property ("breakable"); } + +void +Score_engraver::acknowledge_grob (Grob_info gi) +{ + if (Staff_spacing::has_interface (gi.grob_l_)) + { + Pointer_group_interface::add_grob (command_column_l_, + ly_symbol2scm ("spacing-wishes"), + gi.grob_l_); + } + if (Note_spacing::has_interface (gi.grob_l_)) + { + Pointer_group_interface::add_grob (musical_column_l_, + ly_symbol2scm ("spacing-wishes"), + gi.grob_l_); + } +} + + + +ENTER_DESCRIPTION(Score_engraver, +/* descr */ "Top level engraver. Takes care of generating columns and the complete system (ie. System) + -ADD_THIS_TRANSLATOR(Score_engraver); +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", +/* acks */ "note-spacing-interface staff-spacing-interface", +/* reads */ "currentMusicalColumn currentCommandColumn", +/* write */ "");