X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparating-line-group-engraver.cc;h=796821254b95bf8734c4dc94d9fcd6d56f399968;hb=498d0148b2c2611a8d96549527a3c14fa6e9de04;hp=cb3f54040e7071053ae319e42fcf64aaa1b06599;hpb=aaf7cd07dd2904f4c9278fba174c523a93041998;p=lilypond.git diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc index cb3f54040e..796821254b 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--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ @@ -13,94 +13,197 @@ #include "paper-def.hh" #include "engraver.hh" #include "axis-group-interface.hh" +#include "note-spacing.hh" +#include "group-interface.hh" + +struct Spacings +{ + Item * staff_spacing_; + Link_array note_spacings_; + + Spacings () + { + staff_spacing_ = 0; + } + + bool empty( )const + { + return !staff_spacing_ && !note_spacings_.size (); + } + void clear () { + staff_spacing_ = 0; + note_spacings_.clear(); + } +}; class Separating_line_group_engraver : public Engraver { protected: Item * break_malt_p_; - Item * nobreak_malt_p_; + Item * musical_malt_p_; + Item * last_musical_malt_p_; + + Spacings current_spacings_; + Spacings last_spacings_; + Spanner * sep_span_p_; virtual void acknowledge_grob (Grob_info); virtual void initialize (); virtual void finalize (); virtual void stop_translation_timestep (); + virtual void start_translation_timestep (); public: - Separating_line_group_engraver (); - VIRTUAL_COPY_CONS (Translator); + TRANSLATOR_DECLARATIONS(Separating_line_group_engraver); }; Separating_line_group_engraver::Separating_line_group_engraver () { sep_span_p_ = 0; break_malt_p_ = 0; - nobreak_malt_p_ =0; + musical_malt_p_ =0; } void Separating_line_group_engraver::initialize () { sep_span_p_ = new Spanner (get_property ("SeparatingGroupSpanner")); - Separating_group_spanner::set_interface (sep_span_p_); - announce_grob (sep_span_p_, 0); + + announce_grob(sep_span_p_, SCM_EOL); sep_span_p_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn"))); } void Separating_line_group_engraver::finalize () { - sep_span_p_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn"))); + SCM ccol = get_property ("currentCommandColumn"); + sep_span_p_->set_bound (RIGHT, unsmob_grob (ccol)); typeset_grob (sep_span_p_); sep_span_p_ =0; + + for (int i= 0 ; i < last_spacings_.note_spacings_.size(); i++) + { + last_spacings_.note_spacings_[i]->set_grob_property ("right-items", gh_cons (ccol, SCM_EOL)); + } + + if(last_spacings_.staff_spacing_ + && last_spacings_.staff_spacing_->column_l () == unsmob_grob (ccol)) + { + last_spacings_.staff_spacing_->suicide (); + } } void Separating_line_group_engraver::acknowledge_grob (Grob_info i) { - Item * it = dynamic_cast (i.elem_l_); + Item * it = dynamic_cast (i.grob_l_); if (!it) return; - if (it->parent_l (X_AXIS) - && it->parent_l (X_AXIS)->has_extent_callback_b - (Axis_group_interface::group_extent_callback_proc, X_AXIS)) + if (it->get_parent (X_AXIS) + && it->get_parent (X_AXIS) + ->has_extent_callback_b(Axis_group_interface::group_extent_callback_proc, X_AXIS)) return; + if (Note_spacing::has_interface (it)) + { + current_spacings_.note_spacings_.push (it); + return ; + } bool ib =Item::breakable_b (it); Item *&p_ref_ (ib ? break_malt_p_ - : nobreak_malt_p_); + : musical_malt_p_); if (!p_ref_) { - p_ref_ = new Item - (get_property ("SeparationItem")); - + p_ref_ = new Item (get_property ("SeparationItem")); + if (ib) p_ref_->set_grob_property ("breakable", SCM_BOOL_T); - announce_grob (p_ref_, 0); + announce_grob(p_ref_, SCM_EOL); + + if (p_ref_ == break_malt_p_) + { + 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)); + + announce_grob(it, SCM_EOL); + + if (int i = last_spacings_.note_spacings_.size ()) + { + for (; i--;) + Pointer_group_interface::add_grob (last_spacings_.note_spacings_[i], + ly_symbol2scm ("right-items"), + break_malt_p_); + + } + else if (last_spacings_.staff_spacing_) + { + + last_spacings_.staff_spacing_->set_grob_property ("right-items", + gh_cons (break_malt_p_->self_scm(), SCM_EOL)); + } + } } + Separation_item::add_item (p_ref_,it); } +void +Separating_line_group_engraver::start_translation_timestep () +{ + +} + void Separating_line_group_engraver::stop_translation_timestep () { if (break_malt_p_) { Separating_group_spanner::add_spacing_unit (sep_span_p_, break_malt_p_); - typeset_grob (break_malt_p_); + break_malt_p_ =0; } - if (nobreak_malt_p_) + + if (Item * sp = current_spacings_.staff_spacing_) + { + /* + TODO: should really look at the left-items of following + note-spacing grobs. + */ + if (musical_malt_p_) + Pointer_group_interface::add_grob (sp, ly_symbol2scm ("right-items"), + musical_malt_p_); + + typeset_grob (sp); + } + + + if (!current_spacings_.empty ()) + { + last_spacings_ = current_spacings_; + } + + current_spacings_.clear (); + + if (musical_malt_p_) { - Separating_group_spanner::add_spacing_unit (sep_span_p_, nobreak_malt_p_); - typeset_grob (nobreak_malt_p_); - nobreak_malt_p_ =0; + Separating_group_spanner::add_spacing_unit (sep_span_p_, musical_malt_p_); + typeset_grob (musical_malt_p_); } + + musical_malt_p_ =0; } -ADD_THIS_TRANSLATOR(Separating_line_group_engraver); + +ENTER_DESCRIPTION(Separating_line_group_engraver, +/* descr */ "Generates objects for computing spacing parameters.", +/* creats*/ "SeparationItem SeparatingGroupSpanner", +/* acks */ "grob-interface", +/* reads */ "", +/* write */ "");