X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-engraver.cc;h=d19bf5dd91861990541035de24c80603a8787981;hb=4a449a9403a6981381f185aee0871b584b13c3a6;hp=842a896fb7faacd69d3c68e45fa4557d1c5aeea2;hpb=0af2486a28f1c60b9de929a9101964d880927e54;p=lilypond.git diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index 842a896fb7..d19bf5dd91 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -3,270 +3,348 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2003 Han-Wen Nienhuys */ -#include "debug.hh" - -#include "line-of-score.hh" +#include "all-font-metrics.hh" +#include "afm.hh" +#include "warn.hh" +#include "main.hh" +#include "system.hh" #include "item.hh" #include "score-engraver.hh" #include "paper-score.hh" -#include "musical-request.hh" #include "paper-column.hh" -#include "command-request.hh" + #include "paper-def.hh" #include "axis-group-interface.hh" +#include "translator-def.hh" + +#include "staff-spacing.hh" +#include "note-spacing.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; +} -Score_engraver::Score_engraver() +void +Score_engraver::make_columns () { - scoreline_l_ =0; - command_column_l_ =0; - musical_column_l_ =0; - breaks_i_ =0; - pscore_p_ = 0; + /* + ugh. + */ + if (!command_column_) + { + set_columns (new Paper_column (get_property ("NonMusicalPaperColumn")), + new Paper_column (get_property ("PaperColumn"))); + + command_column_->set_grob_property ("breakable", SCM_BOOL_T); + + + Grob_info i1 (command_column_); + i1.origin_trans_ = this; + + Grob_info i2 (musical_column_); + i2.origin_trans_ = this; + + announce_grob (i1); + announce_grob (i2); + } } - + void Score_engraver::prepare (Moment w) { Global_translator::prepare (w); - SCM props = get_property (ly_symbol2scm ("basicPaperColumnProperties")); - set_columns (new Paper_column (props), new Paper_column (props)); - - SCM when = smobify (new Moment (w)); - command_column_l_->set_elt_property ("when", when); - musical_column_l_->set_elt_property ("when", when); - command_column_l_->set_elt_property ("breakable", SCM_BOOL_T); + /* + TODO: don't make columns when skipTypesetting is true. + */ + make_columns (); - Score_element_info i1(command_column_l_, 0), i2 (musical_column_l_,0); + command_column_->set_grob_property ("when", now_mom_.smobbed_copy ()); + musical_column_->set_grob_property ("when", now_mom_.smobbed_copy ()); - i1.origin_trans_l_ = this; - i2.origin_trans_l_ = this; - announce_element (i1); - announce_element (i2); - post_move_processing(); + Translator_group::start_translation_timestep(); } void -Score_engraver::finish() +Score_engraver::finish () { - if ((breaks_i_%8)) - progress_indication ("[" + to_str ( breaks_i_) + "]"); + if ((breaks_%8)) + progress_indication ("[" + to_string (breaks_) + "]"); - check_removal(); - removal_processing(); + check_removal (); + removal_processing (); + } /* use start/finish? */ void -Score_engraver::do_creation_processing () +Score_engraver::initialize () { - scoreline_l_ = pscore_p_->line_l_; + Font_metric *fm = all_fonts_global->find_afm("feta20"); + if (!fm) + error (_f ("can't find `%s'", "feta20.afm") + + "\n" +_ ("Fonts have not been installed properly. Aborting")); + + unsmob_translator_def (definition_)->apply_property_operations (this); + + assert (dynamic_cast (output_def_)); + assert (!daddy_trans_); + pscore_ = new Paper_score; + pscore_->paper_ = dynamic_cast (output_def_); - scoreline_l_->set_bound(LEFT, command_column_l_); + SCM props = get_property ("System"); + + pscore_->typeset_line (new System (props)); - command_column_l_->set_elt_property ("breakable", SCM_BOOL_T); + make_columns (); + system_ = pscore_->system_; + system_->set_bound (LEFT, command_column_); + command_column_->set_grob_property ("breakable", SCM_BOOL_T); - Engraver_group_engraver::do_creation_processing(); + Engraver_group_engraver::initialize (); } void -Score_engraver::do_removal_processing() +Score_engraver::finalize () { - Engraver_group_engraver::do_removal_processing(); - scoreline_l_->set_bound(RIGHT,command_column_l_); - command_column_l_->set_elt_property ("breakable", SCM_BOOL_T); + Engraver_group_engraver::finalize (); + Grob * cc + = unsmob_grob (get_property ("currentCommandColumn")); + system_->set_bound (RIGHT, cc); + cc->set_grob_property ("breakable", SCM_BOOL_T); typeset_all (); - - - set_columns (0,0); } void -Score_engraver::process() +Score_engraver::one_time_step () { - process_music(); - do_announces(); - pre_move_processing(); - check_removal(); -} + if (!to_boolean (get_property ("skipTypesetting"))) + { + process_music (); + do_announces (); + } + + stop_translation_timestep (); + + apply_finalizations (); + check_removal (); -void -Score_engraver::announce_element (Score_element_info info) -{ - announce_info_arr_.push (info); - pscore_p_->line_l_->typeset_element (info.elem_l_); + + for (int i = announce_infos_.size(); i--;) + { + Grob *g = announce_infos_[i].grob_; + if (!dynamic_cast (g)) // ugh. + { + + String msg= "Grob " + + g->name() + + " was created too late!"; + g->programming_error (msg); + } + } + announce_infos_.clear (); } -/* 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() +Score_engraver::announce_grob (Grob_info info) { - while (announce_info_arr_.size()) - Engraver_group_engraver::do_announces(); + announce_infos_.push (info); + pscore_->system_->typeset_grob (info.grob_); } - void -Score_engraver::typeset_element (Score_element *elem_p) +Score_engraver::typeset_grob (Grob *elem) { - elem_p_arr_.push (elem_p); + if (!elem) + programming_error ("Score_engraver: empty elt\n"); + else + elems_.push (elem); } - void -Score_engraver::typeset_all() +Score_engraver::typeset_all () { - for (int i =0; i < elem_p_arr_.size(); i++) + for (int i =0; i < elems_.size (); i++) { - Score_element * elem_p = elem_p_arr_[i]; - elem_p->add_processing (); - + Grob * elem = elems_[i]; - if (Spanner *s = dynamic_cast (elem_p)) + if (Spanner *s = dynamic_cast (elem)) { - /* + /* do something sensible if spanner not spanned on 2 items. - */ + */ Direction d = LEFT; do { if (!s->get_bound (d)) { - s->set_bound(d, command_column_l_); - ::warning (_f ("unbound spanner `%s'", classname(s))); + s->set_bound (d, command_column_); + /* don't warn for empty/suicided spanners, + it makes real warningsinvisible. + maybe should be junked earlier? */ + if (!elem->live()) + ; // gdb hook + else + elem->warning (_f ("unbound spanner `%s'", s->name ().to_str0 ())); } - } while (flip(&d) != LEFT); + } + while (flip (&d) != LEFT); + + if (dynamic_cast (s->get_parent (Y_AXIS))) + programming_error ("Spanner Y-parent is an item."); } else { - if (!elem_p->parent_l (X_AXIS)) + if (!elem->get_parent (X_AXIS)) { - bool br = to_boolean (elem_p->get_elt_property ("breakable")); - Axis_group_interface::add_element (br ? command_column_l_ : musical_column_l_, elem_p); + bool br = to_boolean (elem->get_grob_property ("breakable")); + Axis_group_interface::add_element (br ? command_column_ : musical_column_, elem); } } - if (!elem_p->parent_l(Y_AXIS)) - Axis_group_interface::add_element (scoreline_l_, elem_p); + if (!elem->get_parent (Y_AXIS)) + Axis_group_interface::add_element (system_, elem); } - elem_p_arr_.clear(); + elems_.clear (); } void -Score_engraver::do_pre_move_processing() +Score_engraver::stop_translation_timestep () { - if (to_boolean (command_column_l_->get_elt_property ("breakable"))) + // this generates all items. + Engraver_group_engraver::stop_translation_timestep (); + + typeset_all (); + if (to_boolean (command_column_->get_grob_property ("breakable"))) { - breaks_i_ ++; - if (! (breaks_i_%8)) - progress_indication ("[" + to_str ( breaks_i_) + "]"); + breaks_ ++; + if (! (breaks_%8)) + progress_indication ("[" + to_string (breaks_) + "]"); } - // this generates all items. - Engraver_group_engraver::do_pre_move_processing(); + + + system_->add_column (command_column_); + system_->add_column (musical_column_); - typeset_all(); + command_column_ = 0; + musical_column_ = 0; } void -Score_engraver::set_columns (Paper_column *new_command_l, - Paper_column *new_musical_l) +Score_engraver::set_columns (Paper_column *new_command, + Paper_column *new_musical) { - Paper_column * news[] = {new_command_l, new_musical_l}; - Paper_column **current[] = {&command_column_l_, &musical_column_l_}; + assert (!command_column_ && !musical_column_); - for (int i=00; i< 2; i++) + command_column_ = new_command; + musical_column_ = new_musical; + if (new_command) { - if (*current[i]) - { - scoreline_l_->add_column ((*current[i])); - if (!(*current[i])->used_b()) - { - (*current[i])->suicide (); - *current[i] =0; - } - } - if (news[i]) - *current[i] = news[i]; + set_property ("currentCommandColumn", new_command->self_scm ()); + } + + if (new_musical) + { + set_property ("currentMusicalColumn", new_musical->self_scm ()); } - - if (new_musical_l) - set_property ("currentMusicalColumn", new_musical_l->self_scm_); - if (new_command_l) - set_property ("currentCommandColumn", new_command_l->self_scm_); } Music_output* -Score_engraver::get_output_p () +Score_engraver::get_output () { - Music_output * o = pscore_p_; - pscore_p_=0; + Music_output * o = pscore_; + pscore_=0; return o; } bool -Score_engraver::do_try_music (Music*r) +Score_engraver::try_music (Music*r) { - bool gotcha = Engraver_group_engraver::do_try_music (r); + bool gotcha = Engraver_group_engraver::try_music (r); - if (!gotcha) + if (!gotcha && r->is_mus_type ("break-event")) { - if (Break_req* b = dynamic_cast (r)) - { - gotcha = true; - - - 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)); - } + gotcha = true; + + SCM pen = command_column_->get_grob_property ("penalty"); + Real total_penalty = gh_number_p (pen) + ? gh_scm2double (pen) + : 0.0; + + SCM rpen = r->get_mus_property ("penalty"); + if (gh_number_p (rpen)) + total_penalty += gh_scm2double (rpen); + + if (total_penalty > 10000.0) // ugh. arbitrary. + forbid_breaks (); + + command_column_->set_grob_property ("penalty", + gh_double2scm (total_penalty)); } - return gotcha; + return gotcha; } +/* + TODO: use property Score.breakForbidden = #t + */ void Score_engraver::forbid_breaks () { /* result is junked. */ - command_column_l_->remove_elt_property ("breakable"); + if (command_column_) + command_column_->set_grob_property ("breakable", SCM_EOL); } - -ADD_THIS_TRANSLATOR(Score_engraver); - + void -Score_engraver::do_add_processing () +Score_engraver::acknowledge_grob (Grob_info gi) { - Translator_group::do_add_processing (); - 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_->typeset_line (new Line_of_score (get_property(ly_symbol2scm ("basicLineOfScoreProperties")))); + 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_); + } } + + +ENTER_DESCRIPTION(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", +/* reads */ "currentMusicalColumn currentCommandColumn", +/* write */ "");