X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-engraver.cc;h=83d2c47eef16eb8394e4125533a8f62133e3ef86;hb=9bc467a994787949def91708bf3bd50d088db982;hp=5aef40446743e993f5d00fa0ec500c131a7123bb;hpb=1d7d22c0171288be6009b68e611beaed18be993c;p=lilypond.git diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index 5aef404467..83d2c47eef 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -6,22 +6,20 @@ (c) 1997--1999 Han-Wen Nienhuys */ +#include "dimension-cache.hh" #include "super-element.hh" #include "line-of-score.hh" #include "debug.hh" #include "item.hh" #include "score-engraver.hh" -#include "p-score.hh" +#include "paper-score.hh" #include "musical-request.hh" #include "score-column.hh" #include "command-request.hh" #include "paper-def.hh" - - Score_engraver::Score_engraver() { - break_penalty_i_ = 0; scoreline_l_ =0; command_column_l_ =0; musical_column_l_ =0; @@ -34,8 +32,8 @@ Score_engraver::prepare (Moment w) { Global_translator::prepare (w); set_columns (new Score_column (w), new Score_column (w)); - - break_penalty_i_ = 0; + + command_column_l_->set_elt_property ("breakable", SCM_BOOL_T); post_move_processing(); } @@ -49,21 +47,28 @@ Score_engraver::finish() removal_processing(); } +/* + use start/finish? + */ void -Score_engraver::do_creation_processing() +Score_engraver::do_creation_processing () { scoreline_l_ = pscore_p_->line_l_; - scoreline_l_->set_bounds(LEFT,command_column_l_); - command_column_l_->set_elt_property (breakable_scm_sym, SCM_BOOL_T); + + scoreline_l_->set_bounds(LEFT, command_column_l_); + + command_column_l_->set_elt_property ("breakable", SCM_BOOL_T); + Engraver_group_engraver::do_creation_processing(); } + void Score_engraver::do_removal_processing() { Engraver_group_engraver::do_removal_processing(); scoreline_l_->set_bounds(RIGHT,command_column_l_); - command_column_l_->set_elt_property (breakable_scm_sym, SCM_BOOL_T); + command_column_l_->set_elt_property ("breakable", SCM_BOOL_T); typeset_all (); set_columns (0,0); @@ -82,35 +87,23 @@ void Score_engraver::announce_element (Score_element_info info) { announce_info_arr_.push (info); - info.origin_grav_l_arr_.push (this); + info.origin_trans_l_arr_.push (this); + pscore_p_->typeset_element (info.elem_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() { - /* 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 - - */ while (announce_info_arr_.size()) - { - for (int i=0; i < announce_info_arr_.size(); i++) - /* - TODO - - More subtle spacing - */ - if (announce_info_arr_[i].req_l_) - { - if (Rhythmic_req *rq = dynamic_cast (announce_info_arr_[i].req_l_)) - { - musical_column_l_->add_duration (rq->length_mom ()); - } - } - Engraver_group_engraver::do_announces(); - } + Engraver_group_engraver::do_announces(); } @@ -127,10 +120,11 @@ Score_engraver::typeset_all() for (int i =0; i < elem_p_arr_.size(); i++) { Score_element * elem_p = elem_p_arr_[i]; + elem_p->add_processing (); + + if (Spanner *s = dynamic_cast (elem_p)) { - pscore_p_->typeset_unbroken_spanner (s); - /* do something sensible if spanner not spanned on 2 items. @@ -140,24 +134,24 @@ Score_engraver::typeset_all() if (!s->spanned_drul_[d]) { s->set_bounds(d, command_column_l_); - ::warning (_f ("Unbound spanner `%s\'", classname(s))); + ::warning (_f ("unbound spanner `%s'", classname(s))); } } while (flip(&d) != LEFT); } else { Item *item_p = dynamic_cast (elem_p); - pscore_p_->typeset_element (item_p); + if (!item_p->parent_l (X_AXIS)) { - bool br = (item_p->remove_elt_property (breakable_scm_sym) != SCM_BOOL_F); + bool br = (item_p->remove_elt_property ("breakable") != SCM_UNDEFINED); if (br) command_column_l_->add_element(item_p); else musical_column_l_->add_element(item_p); } } - if (!elem_p->dim_cache_[Y_AXIS].parent_l_) + if (!elem_p->parent_l(Y_AXIS)) scoreline_l_->add_element (elem_p); } elem_p_arr_.clear(); @@ -166,9 +160,8 @@ Score_engraver::typeset_all() void Score_engraver::do_pre_move_processing() { - if (break_penalty_i_ > Break_req::DISALLOW) + if (command_column_l_->get_elt_property ("breakable") != SCM_UNDEFINED) { - command_column_l_->set_elt_property (breakable_scm_sym, SCM_BOOL_T); breaks_i_ ++; if (! (breaks_i_%8)) *mlog << "[" << breaks_i_ << "]" << flush; @@ -189,30 +182,22 @@ Score_engraver::set_columns (Score_column *new_command_l, scoreline_l_->add_column (command_column_l_); } else - { - delete command_column_l_ ; - command_column_l_ =0; - } + command_column_l_ =0; + if (new_command_l) - { - command_column_l_ = new_command_l; - command_column_l_->musical_b_ = false; - } + command_column_l_ = new_command_l; + if (musical_column_l_ && musical_column_l_->linked_b()) { pscore_p_->add_column (musical_column_l_); scoreline_l_->add_column (musical_column_l_); } else - { - delete musical_column_l_; - musical_column_l_ = 0; - } + musical_column_l_ = 0; if (new_musical_l) { musical_column_l_ = new_musical_l; - musical_column_l_->musical_b_ = true; } } @@ -246,19 +231,33 @@ Score_engraver::do_try_music (Music*r) { if (Break_req* b = dynamic_cast (r)) { - if (b->penalty_i_ <= Break_req::DISALLOW) - break_penalty_i_ = b->penalty_i_; - else if (b->penalty_i_ >= Break_req::FORCE) - { - command_column_l_->break_penalty_i_ = b->penalty_i_; - gotcha = true; - } + gotcha = true; + + + SCM pen = command_column_l_->get_elt_property ("penalty"); + Real total_penalty = (pen == SCM_UNDEFINED) + ? 0.0 + : gh_scm2double(pen); // ugh. Should typecheck. + + total_penalty += b->penalty_f_; + if (b->penalty_f_ > 10000.0) // ugh. arbitrary. + forbid_breaks (); + + command_column_l_->set_elt_property ("penalty", + gh_double2scm (total_penalty)); } } return gotcha; - } +void +Score_engraver::forbid_breaks () +{ + /* + result is junked. + */ + command_column_l_->remove_elt_property ("breakable"); +} ADD_THIS_TRANSLATOR(Score_engraver); @@ -271,3 +270,4 @@ Score_engraver::do_add_processing () pscore_p_ = new Paper_score; pscore_p_->paper_l_ = dynamic_cast(output_def_l_); } +