X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparating-line-group-engraver.cc;h=8a7821a1025e3c5110d3c2a370293ff6a1a9ee33;hb=b98d183aed598bcfe1d79827a724e60025f62ee2;hp=fc8679494ff79591bd4451b13f6c0618f8f710dd;hpb=f57dab636c0caf18cc0ec1c95a3b2bddb61496fd;p=lilypond.git diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc index fc8679494f..8a7821a102 100644 --- a/lily/separating-line-group-engraver.cc +++ b/lily/separating-line-group-engraver.cc @@ -1,152 +1,226 @@ -/* -' 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 - - */ + + (c) 1998--2006 Han-Wen Nienhuys +*/ + +#include "engraver.hh" #include "separating-group-spanner.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 "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_; - Item * last_musical_malt_p_; - - Item * last_note_spacing_; - Item * current_note_spacing_; - Item * staff_spacing_; - - Spanner * sep_span_p_; - - virtual void acknowledge_grob (Grob_info); - virtual void initialize (); + Item *break_item_; + Item *musical_item_; + Item *last_musical_item_; + + Spacings current_spacings_; + Spacings last_spacings_; + + Spanner *sep_span_; + + DECLARE_ACKNOWLEDGER (item); + void process_music (); virtual void finalize (); - virtual void stop_translation_timestep (); + void stop_translation_timestep (); + void start_translation_timestep (); public: - TRANSLATOR_DECLARATIONS(Separating_line_group_engraver); + TRANSLATOR_DECLARATIONS (Separating_line_group_engraver); }; Separating_line_group_engraver::Separating_line_group_engraver () { - last_note_spacing_ = 0; - current_note_spacing_ = 0; - staff_spacing_ =0; - - 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")); + if (!sep_span_) + { + sep_span_ = make_spanner ("SeparatingGroupSpanner", SCM_EOL); - announce_grob (sep_span_p_, 0); - sep_span_p_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn"))); + sep_span_->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"))); - typeset_grob (sep_span_p_); - sep_span_p_ =0; + if (!sep_span_) + return; + + SCM ccol = get_property ("currentCommandColumn"); + Grob *column = unsmob_grob (ccol); + + sep_span_->set_bound (RIGHT, unsmob_grob (ccol)); + sep_span_ = 0; + + for (vsize i = 0; i < last_spacings_.note_spacings_.size (); i++) + { + Pointer_group_interface::add_grob (last_spacings_.note_spacings_[i], + ly_symbol2scm ("right-items"), + column); + } + + if (last_spacings_.staff_spacing_ + && last_spacings_.staff_spacing_->get_column () == column) + last_spacings_.staff_spacing_->suicide (); } void -Separating_line_group_engraver::acknowledge_grob (Grob_info i) +Separating_line_group_engraver::acknowledge_item (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) - && it->get_parent (X_AXIS) - ->has_extent_callback_b(Axis_group_interface::group_extent_callback_proc, X_AXIS)) + && Axis_group_interface::has_axis (it->get_parent (X_AXIS), X_AXIS)) return; - if (Note_spacing::has_interface (it)) + if (to_boolean (it->get_property ("no-spacing-rods"))) + return; + + if (Note_spacing::has_interface (it)) { - current_note_spacing_ = it; - return ; + current_spacings_.note_spacings_.push_back (it); + return; } - - bool ib =Item::breakable_b (it); - Item *&p_ref_ (ib ? break_malt_p_ - : musical_malt_p_); + + bool ib = Item::is_breakable (it); + Item *&p_ref_ (ib ? break_item_ + : musical_item_); if (!p_ref_) { - p_ref_ = new Item (get_property ("SeparationItem")); + p_ref_ = make_item ("SeparationItem", SCM_EOL); if (ib) - p_ref_->set_grob_property ("breakable", SCM_BOOL_T); - announce_grob (p_ref_, 0); - - if (p_ref_ == break_malt_p_) { - staff_spacing_ = new Item (get_property ("StaffSpacing")); - staff_spacing_->set_grob_property ("left-item", break_malt_p_->self_scm ()); - announce_grob (staff_spacing_, 0); + p_ref_->set_property ("breakable", SCM_BOOL_T); + context ()->set_property ("breakableSeparationItem", p_ref_->self_scm ()); + } - if (last_note_spacing_) - last_note_spacing_->set_grob_property ("right-item", - break_malt_p_->self_scm ()); + if (to_boolean (get_property ("createSpacing")) + && p_ref_ == break_item_) + { + Item *it = make_item ("StaffSpacing", SCM_EOL); + current_spacings_.staff_spacing_ = it; + Pointer_group_interface::add_grob (it, ly_symbol2scm ("left-items"), + break_item_); + + 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_item_); + } + else if (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 (break_item_); + } } } - 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::stop_translation_timestep () +Separating_line_group_engraver::start_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; + context ()->unset_property (ly_symbol2scm ("breakableSeparationItem")); + break_item_ = 0; } +} - if (staff_spacing_) - { - if (musical_malt_p_) - staff_spacing_->set_grob_property ("right-item", musical_malt_p_->self_scm()); +void +Separating_line_group_engraver::stop_translation_timestep () +{ + if (break_item_) + Separating_group_spanner::add_spacing_unit (sep_span_, break_item_); - typeset_grob (staff_spacing_); - staff_spacing_ = 0; - } - - if (musical_malt_p_) + if (Item *sp = current_spacings_.staff_spacing_) { - Separating_group_spanner::add_spacing_unit (sep_span_p_, musical_malt_p_); - typeset_grob (musical_malt_p_); + /* + TODO: should really look at the left-items of following + note-spacing grobs. + */ + if (musical_item_) + Pointer_group_interface::add_grob (sp, ly_symbol2scm ("right-items"), + musical_item_); } - last_note_spacing_ = current_note_spacing_ ; - current_note_spacing_ =0 ; - - musical_malt_p_ =0; -} - + if (!current_spacings_.is_empty ()) + last_spacings_ = current_spacings_; + current_spacings_.clear (); + if (musical_item_) + Separating_group_spanner::add_spacing_unit (sep_span_, musical_item_); + musical_item_ = 0; +} -ENTER_DESCRIPTION(Separating_line_group_engraver, -/* descr */ "Generates objects for computing spacing parameters.", -/* creats*/ "SeparationItem SeparatingGroupSpanner", -/* acks */ "grob-interface", -/* reads */ "", -/* write */ ""); +ADD_ACKNOWLEDGER (Separating_line_group_engraver, item); +ADD_TRANSLATOR (Separating_line_group_engraver, + /* doc */ "Generates objects for computing spacing parameters.", + + /* create */ + "SeparationItem " + "SeparatingGroupSpanner " + "StaffSpacing", + /* accept */ "", + /* read */ "createSpacing", + /* write */ "breakableSeparationItem");