X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-engraver.cc;h=442574125418c212a9039b419b668ce959bb7d57;hb=813ef8712c3026794399ff1425a245ffe075efaf;hp=5eef0cb6ee1e44534c3a7c3d9acae1adb66789a3;hpb=304b5f3aa7eee7b0ff8d4ba7526a1410735f6e74;p=lilypond.git diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index 5eef0cb6ee..4425741254 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ #include "all-font-metrics.hh" @@ -11,30 +11,26 @@ #include "warn.hh" #include "main.hh" #include "system.hh" -#include "item.hh" #include "score-engraver.hh" #include "paper-score.hh" #include "paper-column.hh" -#include "paper-def.hh" +#include "output-def.hh" #include "axis-group-interface.hh" #include "context-def.hh" #include "staff-spacing.hh" #include "note-spacing.hh" -#include "context.hh" #include "global-context.hh" - - - +#include "open-type-font.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; + system_ = 0; + command_column_ = 0; + musical_column_ = 0; + breaks_ = 0; pscore_ = 0; } @@ -43,21 +39,24 @@ Score_engraver::make_columns () { /* ugh. - */ + */ if (!command_column_) { SCM nmp - = updated_grob_properties (daddy_context_, + = updated_grob_properties (context (), ly_symbol2scm ("NonMusicalPaperColumn")); - SCM pc = updated_grob_properties (daddy_context_, + + Object_key const *key1 = context ()->get_grob_key ("NonMusicalPaperColumn"); + + SCM pc = updated_grob_properties (context (), ly_symbol2scm ("PaperColumn")); - - set_columns (new Paper_column (nmp), new Paper_column (pc)); + Object_key const *key2 = context ()->get_grob_key ("PaperColumn"); + set_columns (new Paper_column (nmp, key1), new Paper_column (pc, key2)); Grob_info i1; i1.grob_ = command_column_; i1.origin_trans_ = this; - + announce_grob (i1); Grob_info i2; @@ -73,134 +72,109 @@ Score_engraver::prepare (Moment m) { /* TODO: don't make columns when skipTypesetting is true. - */ + */ make_columns (); SCM w = m.smobbed_copy (); command_column_->set_property ("when", w); musical_column_->set_property ("when", w); - - recurse_down_translators (daddy_context_, &Translator::start_translation_timestep, DOWN); + + recurse_over_translators (context (), &Translator::start_translation_timestep, DOWN); } void Score_engraver::finish () { - if ((breaks_%8)) + if ((breaks_ % 8)) progress_indication ("[" + to_string (breaks_) + "]"); - recurse_down_translators (daddy_context_, &Translator::finalize, UP); + recurse_over_translators (context (), &Translator::finalize, UP); } +#define MUSIC_FONT "emmentaler-20" + /* use start/finish? - */ +*/ void Score_engraver::initialize () { - Font_metric *fm = all_fonts_global->find_afm ("feta20"); + Font_metric *fm = all_fonts_global->find_otf (MUSIC_FONT); if (!fm) - error (_f ("can't find `%s'", "feta20.afm") - + "\n" +_ ("Fonts have not been installed properly. Aborting")); - + { + error (_f ("cannot find `%s'", MUSIC_FONT ".otf") + + "\n" + + _ ("Music font has not been installed properly.") + + "\n" + + _f ("Search path `%s'", global_path.to_string ().to_str0 ()) + + "\n" + + _ ("Aborting")); + } + + pscore_ = new Paper_score (dynamic_cast (get_output_def ())); - pscore_ = new Paper_score; - pscore_->paper_ = dynamic_cast (get_output_def ()); + SCM props = updated_grob_properties (context (), ly_symbol2scm ("System")); - SCM props = updated_grob_properties (daddy_context_, ly_symbol2scm ("System")); + Object_key const *sys_key = context ()->get_grob_key ("System"); + pscore_->typeset_system (new System (props, sys_key)); - pscore_->typeset_line (new System (props)); - + system_ = pscore_->root_system (); make_columns (); - system_ = pscore_->system_; system_->set_bound (LEFT, command_column_); command_column_->set_property ("breakable", SCM_BOOL_T); Engraver_group_engraver::initialize (); } - void Score_engraver::finalize () { Score_translator::finalize (); - Grob * cc + Grob *cc = unsmob_grob (get_property ("currentCommandColumn")); system_->set_bound (RIGHT, cc); cc->set_property ("breakable", SCM_BOOL_T); - + typeset_all (); } - void Score_engraver::one_time_step () { if (!to_boolean (get_property ("skipTypesetting"))) { - recurse_down_translators (daddy_context_, &Engraver::process_music, UP); - recurse_down_translators (daddy_context_, &Engraver::do_announces, UP); + recurse_over_translators (context (), &Engraver::process_music, UP); + Engraver_group_engraver::do_announces (); } - - recurse_down_translators (daddy_context_, &Translator::stop_translation_timestep, UP); + + recurse_over_translators (context (), &Translator::stop_translation_timestep, UP); } void Score_engraver::announce_grob (Grob_info info) { announce_infos_.push (info); - pscore_->system_->typeset_grob (info.grob_); -} - -void -Score_engraver::typeset_grob (Grob *elem) -{ - if (!elem) - programming_error ("Score_engraver: empty elt\n"); - else - elems_.push (elem); + pscore_->root_system ()->typeset_grob (info.grob_); + elems_.push (info.grob_); } void Score_engraver::typeset_all () { - for (int i =0; i < elems_.size (); i++) + for (int i = 0; i < elems_.size (); i++) { - Grob * elem = elems_[i]; - - 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_); - /* 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); - - if (dynamic_cast (s->get_parent (Y_AXIS))) - programming_error ("Spanner Y-parent is an item."); - } - else + Grob *elem = elems_[i]; + + if (dynamic_cast (elem)) { - if (!elem->get_parent (X_AXIS)) + if ((!elem->get_parent (X_AXIS) + || !unsmob_grob (elem->get_property ("axis-group-parent-X"))) + && elem != command_column_ + && elem != musical_column_) { bool br = to_boolean (elem->get_property ("breakable")); Axis_group_interface::add_element (br ? command_column_ : musical_column_, elem); - } } if (!elem->get_parent (Y_AXIS)) @@ -214,25 +188,21 @@ Score_engraver::stop_translation_timestep () { // this generates all items. Engraver_group_engraver::stop_translation_timestep (); - + typeset_all (); if (to_boolean (command_column_->get_property ("breakable"))) { - breaks_ ++; + breaks_++; if (! (breaks_%8)) progress_indication ("[" + to_string (breaks_) + "]"); } - - system_->add_column (command_column_); - system_->add_column (musical_column_); - command_column_ = 0; musical_column_ = 0; } void -Score_engraver::set_columns (Paper_column *new_command, +Score_engraver::set_columns (Paper_column *new_command, Paper_column *new_musical) { assert (!command_column_ && !musical_column_); @@ -241,49 +211,57 @@ Score_engraver::set_columns (Paper_column *new_command, musical_column_ = new_musical; if (new_command) { - daddy_context_->set_property ("currentCommandColumn", new_command->self_scm ()); + context ()->set_property ("currentCommandColumn", new_command->self_scm ()); } - + if (new_musical) { - daddy_context_->set_property ("currentMusicalColumn", new_musical->self_scm ()); + context ()->set_property ("currentMusicalColumn", new_musical->self_scm ()); } + + system_->add_column (command_column_); + system_->add_column (musical_column_); } -Music_output* +Music_output * Score_engraver::get_output () { - Music_output * o = pscore_; - pscore_=0; + Music_output *o = pscore_; + ///FIXME WTF ? pscore_ = 0; return o; } - bool -Score_engraver::try_music (Music*r) +Score_engraver::try_music (Music *m) { - bool gotcha = Engraver_group_engraver::try_music (r); + if (Engraver_group_engraver::try_music (m)) + return true; - if (!gotcha && r->is_mus_type ("break-event")) + if (m->is_mus_type ("break-event")) { - gotcha = true; - SCM pen = command_column_->get_property ("penalty"); - Real total_penalty = gh_number_p (pen) - ? gh_scm2double (pen) - : 0.0; - - SCM rpen = r->get_property ("penalty"); - if (gh_number_p (rpen)) - total_penalty += gh_scm2double (rpen); - - if (total_penalty > 10000.0) // ugh. arbitrary. + Real total_penalty = scm_is_number (pen) ? scm_to_double (pen) : 0.0; + + SCM mpen = m->get_property ("penalty"); + if (scm_is_number (mpen)) + total_penalty += scm_to_double (mpen); + + command_column_->set_property ("penalty", scm_make_real (total_penalty)); + + /* ugh. arbitrary, hardcoded */ + if (total_penalty > 10000.0) forbid_breaks (); - command_column_->set_property ("penalty", - gh_double2scm (total_penalty)); + SCM page_pen = command_column_->get_property ("page-penalty"); + Real total_pp = scm_is_number (page_pen) ? scm_to_double (page_pen) : 0.0; + SCM mpage_pen = m->get_property ("page-penalty"); + if (scm_is_number (mpage_pen)) + total_pp += scm_to_double (mpage_pen); + + command_column_->set_property ("page-penalty", scm_make_real (total_pp)); + return true; } - return gotcha; + return false; } void @@ -292,7 +270,7 @@ Score_engraver::forbid_breaks () if (command_column_) command_column_->set_property ("breakable", SCM_EOL); } - + void Score_engraver::acknowledge_grob (Grob_info gi) { @@ -308,22 +286,34 @@ Score_engraver::acknowledge_grob (Grob_info gi) ly_symbol2scm ("spacing-wishes"), gi.grob_); } -} + if (Axis_group_interface::has_interface (gi.grob_) + && gi.grob_->internal_has_interface (ly_symbol2scm ("vertically-spaceable-interface"))) + { + SCM spaceable = get_property ("verticallySpacedContexts"); + Context *orig = gi.origin_contexts (this)[0]; + if (scm_memq (ly_symbol2scm (orig->context_name ().to_str0 ()), + spaceable) != SCM_BOOL_F) + { + Pointer_group_interface::add_grob (system_, + ly_symbol2scm ("spaceable-staves"), + 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 */ ""); +ADD_TRANSLATOR (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 axis-group-interface", + /* reads */ "currentMusicalColumn currentCommandColumn verticallySpacedContexts", + /* write */ "");