X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-engraver.cc;h=46d2078a424e19c056417917e9581abfb239ff7d;hb=28240aceaab110b424d8e37cb8024ad5f815d57f;hp=f99ed6151d497ff49bd42768e9365f8314b5fdab;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index f99ed6151d..46d2078a42 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" @@ -20,52 +20,52 @@ #include "staff-spacing.hh" #include "note-spacing.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; } +void +Score_engraver::derived_mark () const +{ + if (pscore_) + scm_gc_mark (pscore_->self_scm ()); + Score_translator::derived_mark (); + Engraver_group_engraver::derived_mark (); +} + void Score_engraver::make_columns () { /* ugh. - */ + */ if (!command_column_) { SCM nmp = updated_grob_properties (context (), ly_symbol2scm ("NonMusicalPaperColumn")); - Object_key const *key1 = context()->get_grob_key ("NonMusicalPaperColumn"); - + Object_key const *key1 = context ()->get_grob_key ("NonMusicalPaperColumn"); + SCM pc = updated_grob_properties (context (), ly_symbol2scm ("PaperColumn")); - Object_key const *key2 = context()->get_grob_key ("PaperColumn"); + Object_key const *key2 = context ()->get_grob_key ("PaperColumn"); set_columns (new Paper_column (nmp, key1), new Paper_column (pc, key2)); - - scm_gc_unprotect_object (key1->self_scm()); - scm_gc_unprotect_object (key2->self_scm()); - - Grob_info i1; - i1.grob_ = command_column_; - i1.origin_trans_ = this; - + Grob_info i1 (this, command_column_); announce_grob (i1); - Grob_info i2; - i2.grob_ = musical_column_; - i2.origin_trans_ = this; - + Grob_info i2 (this, musical_column_); announce_grob (i2); } } @@ -75,7 +75,7 @@ Score_engraver::prepare (Moment m) { /* TODO: don't make columns when skipTypesetting is true. - */ + */ make_columns (); SCM w = m.smobbed_copy (); @@ -88,77 +88,70 @@ Score_engraver::prepare (Moment m) void Score_engraver::finish () { - if ((breaks_%8)) + if ((breaks_ % 8)) progress_indication ("[" + to_string (breaks_) + "]"); 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 ("cannot find `%s'", "feta20.afm") - + "\n" - + _ ("Music font has not been installed properly.") - + _ ("Aborting")); - - if (!scm_is_string (ly_kpathsea_find_file (scm_makfrom0str ("ecrm10.pfa"))) - && (!scm_is_string (ly_kpathsea_find_file (scm_makfrom0str ("lmr10.pfb"))))) - error (_f ("cannot find `%s'", "ecrm10.pfa") + { + error (_f ("cannot find `%s'", MUSIC_FONT ".otf") + "\n" - + _f ("cannot find `%s'", "lmr10.pfb") + + _ ("Music font has not been installed properly.") + "\n" - + _f ("Install the ec-fonts-mftraced package from: %s.", - "http://lilypond.org/download/fonts/") + + _f ("Search path `%s'", global_path.to_string ().to_str0 ()) + "\n" - + _ ("Aborting.")); - - pscore_ = new Paper_score; - pscore_->layout_ = dynamic_cast (get_output_def ()); + + _ ("Aborting")); + } + + pscore_ = new Paper_score (dynamic_cast (get_output_def ())); + scm_gc_unprotect_object (pscore_->self_scm ()); SCM props = updated_grob_properties (context (), ly_symbol2scm ("System")); - Object_key const *sys_key = context()->get_grob_key ("System"); - pscore_->typeset_line (new System (props, sys_key)); - scm_gc_unprotect_object (sys_key->self_scm ()); - + Object_key const *sys_key = context ()->get_grob_key ("System"); + pscore_->typeset_system (new System (props, sys_key)); + + 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_over_translators (context (), &Engraver::process_music, UP); - Engraver_group_engraver::do_announces(); + Engraver_group_engraver::do_announces (); } - + recurse_over_translators (context (), &Translator::stop_translation_timestep, UP); } @@ -166,29 +159,26 @@ void Score_engraver::announce_grob (Grob_info info) { announce_infos_.push (info); - pscore_->system_->typeset_grob (info.grob_); - elems_.push (info.grob_); + 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]; + Grob *elem = elems_[i]; - - if (dynamic_cast (elem)) + 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_ - ) + && 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)) @@ -202,25 +192,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_); @@ -229,21 +215,23 @@ Score_engraver::set_columns (Paper_column *new_command, musical_column_ = new_musical; if (new_command) { - context ()->set_property ("currentCommandColumn", new_command->self_scm ()); + context ()->set_property ("currentCommandColumn", new_command->self_scm ()); } - + if (new_musical) { context ()->set_property ("currentMusicalColumn", new_musical->self_scm ()); } + + system_->add_column (command_column_); + system_->add_column (musical_column_); } -Music_output* +SCM Score_engraver::get_output () { Music_output *o = pscore_; - ///FIXME WTF? pscore_ = 0; - return o; + return o->self_scm (); } bool @@ -272,7 +260,7 @@ Score_engraver::try_music (Music *m) 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; } @@ -285,54 +273,50 @@ Score_engraver::forbid_breaks () if (command_column_) command_column_->set_property ("breakable", SCM_EOL); } - + void Score_engraver::acknowledge_grob (Grob_info gi) { - if (Staff_spacing::has_interface (gi.grob_)) + if (Staff_spacing::has_interface (gi.grob ())) { Pointer_group_interface::add_grob (command_column_, ly_symbol2scm ("spacing-wishes"), - gi.grob_); + gi.grob ()); } - if (Note_spacing::has_interface (gi.grob_)) + if (Note_spacing::has_interface (gi.grob ())) { Pointer_group_interface::add_grob (musical_column_, ly_symbol2scm ("spacing-wishes"), - gi.grob_); + gi.grob ()); } - if (Axis_group_interface::has_interface (gi.grob_) - && gi.grob_->internal_has_interface (ly_symbol2scm ("vertically-spaceable-interface"))) + 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()), + + 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_); + 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 axis-group-interface", -/* reads */ "currentMusicalColumn currentCommandColumn verticallySpacedContexts", -/* 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 */ "");