X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-engraver.cc;h=81bf16fa25b90ff5418bfcdb6f40747d4c4b55a9;hb=bb36bac02a64770871780231ecc709cb18b20932;hp=70d2943c74a2bfe7d2fad7265f083c9e7d486ede;hpb=78ed9c22a8cbf56ff5390553e0a2854aa42cbbc5;p=lilypond.git diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index 70d2943c74..81bf16fa25 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -3,25 +3,21 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys */ - -#include "super-element.hh" -#include "line-of-score.hh" #include "debug.hh" +#include "dimension-cache.hh" +#include "line-of-score.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 "paper-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; @@ -33,9 +29,9 @@ void Score_engraver::prepare (Moment w) { Global_translator::prepare (w); - set_columns (new Score_column (w), new Score_column (w)); - - break_penalty_i_ = 0; + set_columns (new Paper_column (w), new Paper_column (w)); + + command_column_l_->set_elt_property ("breakable", SCM_BOOL_T); post_move_processing(); } @@ -43,7 +39,7 @@ void Score_engraver::finish() { if ((breaks_i_%8)) - *mlog << "[" << breaks_i_ << "]" << flush; + progress_indication ("[" + to_str ( breaks_i_) + "]"); check_removal(); removal_processing(); @@ -56,8 +52,10 @@ void 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(); } @@ -68,7 +66,7 @@ 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); @@ -88,11 +86,7 @@ Score_engraver::announce_element (Score_element_info info) { announce_info_arr_.push (info); 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); + pscore_p_->typeset_element (info.elem_l_); } /* All elements are propagated to the top upon announcement. If @@ -125,6 +119,8 @@ Score_engraver::typeset_all() { Score_element * elem_p = elem_p_arr_[i]; elem_p->add_processing (); + + if (Spanner *s = dynamic_cast (elem_p)) { /* @@ -136,7 +132,7 @@ 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); } @@ -146,14 +142,14 @@ Score_engraver::typeset_all() if (!item_p->parent_l (X_AXIS)) { - bool br = (item_p->remove_elt_property (breakable_scm_sym) != SCM_BOOL_F); + bool br = to_boolean (item_p->remove_elt_property ("breakable")); 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(); @@ -162,12 +158,11 @@ Score_engraver::typeset_all() void Score_engraver::do_pre_move_processing() { - if (break_penalty_i_ > Break_req::DISALLOW) + if (to_boolean (command_column_l_->get_elt_property ("breakable"))) { - command_column_l_->set_elt_property (breakable_scm_sym, SCM_BOOL_T); breaks_i_ ++; if (! (breaks_i_%8)) - *mlog << "[" << breaks_i_ << "]" << flush; + progress_indication ("[" + to_str ( breaks_i_) + "]"); } // this generates all items. Engraver_group_engraver::do_pre_move_processing(); @@ -176,8 +171,8 @@ Score_engraver::do_pre_move_processing() } void -Score_engraver::set_columns (Score_column *new_command_l, - Score_column *new_musical_l) +Score_engraver::set_columns (Paper_column *new_command_l, + Paper_column *new_musical_l) { if (command_column_l_ && command_column_l_->linked_b()) { @@ -185,10 +180,8 @@ 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; @@ -198,10 +191,7 @@ Score_engraver::set_columns (Score_column *new_command_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) { @@ -209,7 +199,6 @@ Score_engraver::set_columns (Score_column *new_command_l, } } - Staff_info Score_engraver::get_staff_info() const { @@ -221,7 +210,6 @@ Score_engraver::get_staff_info() const return inf; } - Music_output* Score_engraver::get_output_p () { @@ -237,16 +225,22 @@ Score_engraver::do_try_music (Music*r) if (!gotcha) { - /* - UGH! THIS IS NOT SYMMETRIC. CLEAN ME UP! - */ if (Break_req* b = dynamic_cast (r)) { 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_; + + + SCM pen = command_column_l_->get_elt_property ("penalty"); + Real total_penalty = gh_number_p (pen) + ? gh_scm2double(pen) + : 0.0; + + 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; @@ -255,7 +249,10 @@ Score_engraver::do_try_music (Music*r) void Score_engraver::forbid_breaks () { - break_penalty_i_ = Break_req::DISALLOW; + /* + result is junked. + */ + command_column_l_->remove_elt_property ("breakable"); } ADD_THIS_TRANSLATOR(Score_engraver); @@ -269,3 +266,4 @@ Score_engraver::do_add_processing () pscore_p_ = new Paper_score; pscore_p_->paper_l_ = dynamic_cast(output_def_l_); } +