X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-engraver.cc;h=1c1d39205c9acb7f8def95fe82d33afd0c7892a3;hb=0a92b605eb18b62d171c97f354c2101109d9e071;hp=c5350418efa622c5e552380c47ea23fdae424d07;hpb=6dfa9e3be119a27e17be77c6374ada2e173cda3e;p=lilypond.git diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index c5350418ef..1c1d39205c 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -3,21 +3,20 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (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" -#include "main.hh" - Score_engraver::Score_engraver() { @@ -49,21 +48,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,get_staff_info().command_pcol_l ()); - command_column_l_->breakable_b_ = true; + + scoreline_l_->set_bounds(LEFT, command_column_l_); + + command_column_l_->set_elt_property (breakable_scm_sym, 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,get_staff_info().command_pcol_l ()); - command_column_l_->breakable_b_ = true; + scoreline_l_->set_bounds(RIGHT,command_column_l_); + command_column_l_->set_elt_property (breakable_scm_sym, SCM_BOOL_T); typeset_all (); set_columns (0,0); @@ -82,59 +88,58 @@ 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); + + if (Spanner *s = dynamic_cast (info.elem_l_)) + pscore_p_->typeset_unbroken_spanner (s); + else if (Item *i = dynamic_cast (info.elem_l_)) + pscore_p_->typeset_element (i); } +/* 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_) - { - Musical_req *m = announce_info_arr_[i].req_l_->access_Musical_req (); - if (m && m->access_Rhythmic_req ()) - { - musical_column_l_->add_duration (m->duration()); - } - } - Engraver_group_engraver::do_announces(); - } + Engraver_group_engraver::do_announces(); } void Score_engraver::typeset_element (Score_element *elem_p) { - elem_p_arr_.push(elem_p); + elem_p_arr_.push (elem_p); } + void Score_engraver::typeset_all() { for (int i =0; i < elem_p_arr_.size(); i++) { Score_element * elem_p = elem_p_arr_[i]; - if (elem_p->access_Spanner ()) + elem_p->add_processing (); + +#if 0 // TODO! + /* + elem_p wants to be connected to the rest of the + dependency graph. + */ + + if (elem_p->get_elt_property (dangling_scm_sym) != SCM_BOOL_F) + scoreline_l_->add_dependency (elem_p); +#endif + + if (Spanner *s = dynamic_cast (elem_p)) { - Spanner *s = elem_p->access_Spanner (); - pscore_p_->typeset_unbroken_spanner (s); - - - - /* + /* do something sensible if spanner not spanned on 2 items. */ @@ -143,22 +148,25 @@ Score_engraver::typeset_all() if (!s->spanned_drul_[d]) { s->set_bounds(d, command_column_l_); - ::warning (_f ("Unbound spanner `%s\'", s->name ())); + ::warning (_f ("unbound spanner `%s'", classname(s))); } } while (flip(&d) != LEFT); } else { - Item *item_p = elem_p->access_Item (); - pscore_p_->typeset_element (item_p); - if (!item_p->axis_group_l_a_[X_AXIS]) { - if (item_p->breakable_b_) - command_column_l_->add_element(item_p); - else - musical_column_l_->add_element(item_p); - } + Item *item_p = dynamic_cast (elem_p); + + if (!item_p->parent_l (X_AXIS)) + { + bool br = (item_p->remove_elt_property (breakable_scm_sym) != SCM_BOOL_F); + if (br) + command_column_l_->add_element(item_p); + else + musical_column_l_->add_element(item_p); + } } - scoreline_l_->add_element (elem_p); + if (!elem_p->parent_l(Y_AXIS)) + scoreline_l_->add_element (elem_p); } elem_p_arr_.clear(); } @@ -168,7 +176,7 @@ Score_engraver::do_pre_move_processing() { if (break_penalty_i_ > Break_req::DISALLOW) { - get_staff_info().command_pcol_l ()-> breakable_b_ = true; + command_column_l_->set_elt_property (breakable_scm_sym, SCM_BOOL_T); breaks_i_ ++; if (! (breaks_i_%8)) *mlog << "[" << breaks_i_ << "]" << flush; @@ -186,7 +194,7 @@ Score_engraver::set_columns (Score_column *new_command_l, if (command_column_l_ && command_column_l_->linked_b()) { pscore_p_->add_column (command_column_l_); - scoreline_l_->add_element (command_column_l_); + scoreline_l_->add_column (command_column_l_); } else { @@ -194,14 +202,12 @@ Score_engraver::set_columns (Score_column *new_command_l, 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_element (musical_column_l_); + scoreline_l_->add_column (musical_column_l_); } else { @@ -212,7 +218,6 @@ Score_engraver::set_columns (Score_column *new_command_l, if (new_musical_l) { musical_column_l_ = new_musical_l; - musical_column_l_->musical_b_ = true; } } @@ -229,7 +234,6 @@ Score_engraver::get_staff_info() const } - Music_output* Score_engraver::get_output_p () { @@ -239,52 +243,41 @@ Score_engraver::get_output_p () } bool -Score_engraver::do_try_request (Request*r) +Score_engraver::do_try_music (Music*r) { - bool gotcha = Engraver_group_engraver::do_try_request (r); + bool gotcha = Engraver_group_engraver::do_try_music (r); - if (gotcha || !r->access_Command_req ()) - return gotcha; - - Command_req * c = r->access_Command_req (); - if (c->access_Break_req ()) + if (!gotcha) { - Break_req* b = (Break_req*)c->access_Break_req (); - if (b->penalty_i_ <= Break_req::DISALLOW) - break_penalty_i_ = b->penalty_i_; - else if (b->penalty_i_ >= Break_req::FORCE) + /* + UGH! THIS IS NOT SYMMETRIC. CLEAN ME UP! + */ + if (Break_req* b = dynamic_cast (r)) { - command_column_l_->break_penalty_i_ = b->penalty_i_; gotcha = true; + 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_; } } - return gotcha; + return gotcha; +} + +void +Score_engraver::forbid_breaks () +{ + break_penalty_i_ = Break_req::DISALLOW; } -IMPLEMENT_IS_TYPE_B1(Score_engraver,Engraver_group_engraver); ADD_THIS_TRANSLATOR(Score_engraver); void Score_engraver::do_add_processing () { Translator_group::do_add_processing (); - //assert (output_def_l_->is_type_b (Paper_def::static_name ())); - // urg - pscore_p_ = output_def_l_->paper_score_p (); - // assert (pscore_p_); - // urg, via parser a Paper_def gets constructed - // this should never happen, but can't be prevented (Paper_def can't be - // abstract bo virtual_copy_cons etc. - if (!pscore_p_) - { - printf ("\nBRAAK\n"); - output_def_l_ = global_paper_l->paper_l ()->clone (); - // pscore_p_ = output_def_l_->paper_score_p (); - pscore_p_ = global_paper_l->paper_score_p (); - pscore_p_->paper_l_ = global_paper_l->paper_l (); - } - else - pscore_p_->paper_l_ = output_def_l_->paper_l (); - assert (pscore_p_->paper_l_); + assert (dynamic_cast (output_def_l_)); assert (!daddy_trans_l_); + pscore_p_ = new Paper_score; + pscore_p_->paper_l_ = dynamic_cast(output_def_l_); }