X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparating-line-group-engraver.cc;h=cd6b5ca86843477d996f3f0baa4cc3979caebe92;hb=3c67861bee1205918eb0c83a26c8c833ba2b0ad5;hp=b21c434e6774ac373865e8b25b5e222e41235b8c;hpb=bdfe0b360b4d864feff276f4efbf58101c90d6b3;p=lilypond.git diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc index b21c434e67..cd6b5ca868 100644 --- a/lily/separating-line-group-engraver.cc +++ b/lily/separating-line-group-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2002 Han-Wen Nienhuys + (c) 1998--2003 Han-Wen Nienhuys */ @@ -15,6 +15,9 @@ #include "axis-group-interface.hh" #include "note-spacing.hh" #include "group-interface.hh" +#include "accidental-placement.hh" +#include "translator-group.hh" + struct Spacings { @@ -36,20 +39,21 @@ struct Spacings } }; + class Separating_line_group_engraver : public Engraver { protected: - Item * break_malt_p_; - Item * musical_malt_p_; - Item * last_musical_malt_p_; + Item * break_item_; + Item * musical_item_; + Item * last_musical_item_; Spacings current_spacings_; Spacings last_spacings_; - Spanner * sep_span_p_; + Spanner * sep_span_; virtual void acknowledge_grob (Grob_info); - virtual void initialize (); + virtual void process_music (); virtual void finalize (); virtual void stop_translation_timestep (); virtual void start_translation_timestep (); @@ -59,29 +63,32 @@ public: Separating_line_group_engraver::Separating_line_group_engraver () { - sep_span_p_ = 0; - break_malt_p_ = 0; - musical_malt_p_ =0; + sep_span_ = 0; + break_item_ = 0; + musical_item_ =0; } void -Separating_line_group_engraver::initialize () +Separating_line_group_engraver::process_music () { - sep_span_p_ = new Spanner (get_property ("SeparatingGroupSpanner")); - announce_grob(sep_span_p_, SCM_EOL); - sep_span_p_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn"))); -} + if (!sep_span_) + { + sep_span_ = new Spanner (get_property ("SeparatingGroupSpanner")); + announce_grob(sep_span_, SCM_EOL); + sep_span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn"))); + } +} void Separating_line_group_engraver::finalize () { SCM ccol = get_property ("currentCommandColumn"); Grob *column = unsmob_grob (ccol); - sep_span_p_->set_bound (RIGHT, unsmob_grob (ccol)); - typeset_grob (sep_span_p_); - sep_span_p_ =0; + sep_span_->set_bound (RIGHT, unsmob_grob (ccol)); + typeset_grob (sep_span_); + sep_span_ =0; for (int i= 0 ; i < last_spacings_.note_spacings_.size(); i++) { @@ -91,7 +98,7 @@ Separating_line_group_engraver::finalize () } if(last_spacings_.staff_spacing_ - && last_spacings_.staff_spacing_->column_l () == column) + && last_spacings_.staff_spacing_->get_column () == column) { last_spacings_.staff_spacing_->suicide (); } @@ -100,7 +107,7 @@ Separating_line_group_engraver::finalize () void Separating_line_group_engraver::acknowledge_grob (Grob_info i) { - Item * it = dynamic_cast (i.grob_l_); + Item * it = dynamic_cast (i.grob_); if (!it) return; if (it->get_parent (X_AXIS) @@ -108,7 +115,6 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i) ->has_extent_callback_b(Axis_group_interface::group_extent_callback_proc, X_AXIS)) return; - if (to_boolean (it->get_grob_property ("no-spacing-rods"))) return ; @@ -120,22 +126,25 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i) } bool ib =Item::breakable_b (it); - Item *&p_ref_ (ib ? break_malt_p_ - : musical_malt_p_); + Item *&p_ref_ (ib ? break_item_ + : musical_item_); if (!p_ref_) { p_ref_ = new Item (get_property ("SeparationItem")); if (ib) - p_ref_->set_grob_property ("breakable", SCM_BOOL_T); + { + p_ref_->set_grob_property ("breakable", SCM_BOOL_T); + daddy_trans_->set_property ("breakableSeparationItem", p_ref_->self_scm ()); + } announce_grob(p_ref_, SCM_EOL); - if (p_ref_ == break_malt_p_) + if (p_ref_ == break_item_) { Item *it = new Item (get_property ("StaffSpacing")); current_spacings_.staff_spacing_ = it; - it->set_grob_property ("left-items", gh_cons (break_malt_p_->self_scm (), SCM_EOL)); + it->set_grob_property ("left-items", gh_cons (break_item_->self_scm (), SCM_EOL)); announce_grob(it, SCM_EOL); @@ -144,36 +153,39 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i) for (; i--;) Pointer_group_interface::add_grob (last_spacings_.note_spacings_[i], ly_symbol2scm ("right-items"), - break_malt_p_); + break_item_); } else if (last_spacings_.staff_spacing_) { last_spacings_.staff_spacing_->set_grob_property ("right-items", - gh_cons (break_malt_p_->self_scm(), SCM_EOL)); + gh_cons (break_item_->self_scm(), SCM_EOL)); } } } - Separation_item::add_item (p_ref_,it); + if (Accidental_placement::has_interface (it)) + Separation_item::add_conditional_item (p_ref_, it); + else + Separation_item::add_item (p_ref_,it); } void Separating_line_group_engraver::start_translation_timestep () { - + if (break_item_) + daddy_trans_->unset_property (ly_symbol2scm ("breakableSeparationItem")); + break_item_ =0; } void Separating_line_group_engraver::stop_translation_timestep () { - if (break_malt_p_) + if (break_item_) { - Separating_group_spanner::add_spacing_unit (sep_span_p_, break_malt_p_); - typeset_grob (break_malt_p_); - - break_malt_p_ =0; + Separating_group_spanner::add_spacing_unit (sep_span_, break_item_); + typeset_grob (break_item_); } if (Item * sp = current_spacings_.staff_spacing_) @@ -182,9 +194,9 @@ Separating_line_group_engraver::stop_translation_timestep () TODO: should really look at the left-items of following note-spacing grobs. */ - if (musical_malt_p_) + if (musical_item_) Pointer_group_interface::add_grob (sp, ly_symbol2scm ("right-items"), - musical_malt_p_); + musical_item_); typeset_grob (sp); } @@ -197,19 +209,20 @@ Separating_line_group_engraver::stop_translation_timestep () current_spacings_.clear (); - if (musical_malt_p_) + if (musical_item_) { - Separating_group_spanner::add_spacing_unit (sep_span_p_, musical_malt_p_); - typeset_grob (musical_malt_p_); + Separating_group_spanner::add_spacing_unit (sep_span_, musical_item_); + typeset_grob (musical_item_); } - musical_malt_p_ =0; + musical_item_ =0; } ENTER_DESCRIPTION(Separating_line_group_engraver, /* descr */ "Generates objects for computing spacing parameters.", /* creats*/ "SeparationItem SeparatingGroupSpanner", -/* acks */ "item-interface", +/* accepts */ "", +/* acks */ "item-interface", /* reads */ "", -/* write */ ""); +/* write */ "breakableSeparationItem");