X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparating-line-group-engraver.cc;h=aafb49399e57c68e9ee2ad843536293296aedcba;hb=9453963fa61b32435f55ebfb7180d739aa538a35;hp=5ac89108964b20cb48853902c5d23a9da64c5b3a;hpb=54404c570a48ddf9772c5ca64a154d0c0149e61e;p=lilypond.git diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc index 5ac8910896..aafb49399e 100644 --- a/lily/separating-line-group-engraver.cc +++ b/lily/separating-line-group-engraver.cc @@ -1,128 +1,154 @@ -/* -' separating-line-group-engraver.cc -- implement Separating_line_group_engraver - +/* + separating-line-group-engraver.cc -- implement Separating_line_group_engraver + source file of the GNU LilyPond music typesetter - - (c) 1998--2001 Han-Wen Nienhuys - - */ -#include "separating-group-spanner.hh" + (c) 1998--2007 Han-Wen Nienhuys +*/ + +#include "engraver.hh" + #include "separation-item.hh" #include "paper-column.hh" -#include "paper-def.hh" -#include "engraver.hh" +#include "output-def.hh" #include "axis-group-interface.hh" +#include "note-spacing.hh" +#include "accidental-placement.hh" +#include "context.hh" +#include "spanner.hh" +#include "grob-array.hh" +#include "pointer-group-interface.hh" + +#include "translator.icc" + +struct Spacings +{ + Item *staff_spacing_; + vector note_spacings_; + + Spacings () + { + staff_spacing_ = 0; + } + + bool is_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 * musical_malt_p_; - - /* - malt_p_ : we used to have a Single_malt_grouping_item - - */ - Item * last_step_musical_malt_p_; - - Spanner * sep_span_p_; - - virtual void acknowledge_grob (Grob_info); - virtual void initialize (); - virtual void finalize (); - virtual void stop_translation_timestep (); + Spacings current_spacings_; + Spacings last_spacings_; + + DECLARE_ACKNOWLEDGER (item); + DECLARE_ACKNOWLEDGER (break_aligned); + void stop_translation_timestep (); + void start_translation_timestep (); + + vector break_aligned_; public: - Separating_line_group_engraver (); - VIRTUAL_COPY_CONS (Translator); + TRANSLATOR_DECLARATIONS (Separating_line_group_engraver); }; Separating_line_group_engraver::Separating_line_group_engraver () { - last_step_musical_malt_p_ = 0; - sep_span_p_ = 0; - break_malt_p_ = 0; - musical_malt_p_ =0; } void -Separating_line_group_engraver::initialize () +Separating_line_group_engraver::acknowledge_item (Grob_info i) { - sep_span_p_ = new Spanner (get_property ("SeparatingGroupSpanner")); + Item *it = i.item (); + + if (Note_spacing::has_interface (it)) + { + current_spacings_.note_spacings_.push_back (it); + return; + } - announce_grob (sep_span_p_, 0); - sep_span_p_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn"))); + if (Item::is_non_musical (it) + && !current_spacings_.staff_spacing_ + && to_boolean (get_property ("createSpacing"))) + { + Grob *col = unsmob_grob (get_property ("currentCommandColumn")); + + current_spacings_.staff_spacing_ = make_item ("StaffSpacing", SCM_EOL); + context ()->set_property ("hasStaffSpacing", SCM_BOOL_T); + + Pointer_group_interface::add_grob (current_spacings_.staff_spacing_, + ly_symbol2scm ("left-items"), + col); + + if (!last_spacings_.note_spacings_.size () + && last_spacings_.staff_spacing_) + { + SCM ri = last_spacings_.staff_spacing_->get_object ("right-items"); + Grob_array *ga = unsmob_grob_array (ri); + if (!ga) + { + SCM ga_scm = Grob_array::make_array (); + last_spacings_.staff_spacing_->set_object ("right-items", ga_scm); + ga = unsmob_grob_array (ga_scm); + } + + ga->clear (); + ga->add (col); + } + } } void -Separating_line_group_engraver::finalize () +Separating_line_group_engraver::acknowledge_break_aligned (Grob_info gi) { - sep_span_p_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn"))); - typeset_grob (sep_span_p_); - sep_span_p_ =0; + break_aligned_.push_back (gi.grob ()); } void -Separating_line_group_engraver::acknowledge_grob (Grob_info i) +Separating_line_group_engraver::start_translation_timestep () { - Item * it = dynamic_cast (i.elem_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)) - return; - - - bool ib =Item::breakable_b (it); - Item *&p_ref_ (ib ? break_malt_p_ - : musical_malt_p_); - - if (!p_ref_) - { - p_ref_ = new Item - (get_property ("SeparationItem")); - - if (ib) - p_ref_->set_grob_property ("breakable", SCM_BOOL_T); - announce_grob (p_ref_, 0); - } - Separation_item::add_item (p_ref_,it); + context ()->unset_property (ly_symbol2scm ("hasStaffSpacing")); } void Separating_line_group_engraver::stop_translation_timestep () { - if (break_malt_p_) + for (vsize i = 0; i < break_aligned_.size (); i++) { - Separating_group_spanner::add_spacing_unit (sep_span_p_, break_malt_p_); - - typeset_grob (break_malt_p_); - break_malt_p_ =0; - } - if (musical_malt_p_) - { - Separating_group_spanner::add_spacing_unit (sep_span_p_, musical_malt_p_); + SCM smob = break_aligned_[i]->self_scm (); - if (last_step_musical_malt_p_) - { - Paper_column *col = - last_step_musical_malt_p_->column_l(); - SCM newtup = gh_cons (last_step_musical_malt_p_->self_scm (), - musical_malt_p_->self_scm ()); - col->set_grob_property ("spacing-sequence", - gh_cons (newtup, - col->get_grob_property ("spacing-sequence"))); - } - - typeset_grob (musical_malt_p_); + if (Item *sp = current_spacings_.staff_spacing_) + Pointer_group_interface::add_grob (sp, ly_symbol2scm ("left-break-aligned"), smob); + + for (vsize j = 0; j < last_spacings_.note_spacings_.size (); j++) + Pointer_group_interface::add_grob (last_spacings_.note_spacings_[j], + ly_symbol2scm ("right-break-aligned"), smob); } - last_step_musical_malt_p_ = musical_malt_p_; - musical_malt_p_ =0; -} + if (!current_spacings_.is_empty ()) + last_spacings_ = current_spacings_; + if (Item *sp = current_spacings_.staff_spacing_) + if (Grob *col = unsmob_grob (get_property ("currentMusicalColumn"))) + Pointer_group_interface::add_grob (sp, ly_symbol2scm ("right-items"), col); + + current_spacings_.clear (); + break_aligned_.clear (); +} +ADD_ACKNOWLEDGER (Separating_line_group_engraver, item); +ADD_ACKNOWLEDGER (Separating_line_group_engraver, break_aligned); -ADD_THIS_TRANSLATOR (Separating_line_group_engraver); +ADD_TRANSLATOR (Separating_line_group_engraver, + /* doc */ "Generates objects for computing spacing parameters.", + /* create */ "StaffSpacing", + /* read */ "createSpacing", + /* write */ "hasStaffSpacing" + );