X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparating-line-group-engraver.cc;h=b2aeb9b2ab4e72fe492f84114cb1cd1e06cb59a2;hb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;hp=9d95c17f3919080894ee9f057b55389bf346de35;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc index 9d95c17f39..b2aeb9b2ab 100644 --- a/lily/separating-line-group-engraver.cc +++ b/lily/separating-line-group-engraver.cc @@ -1,25 +1,31 @@ /* - ' 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--2005 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 "output-def.hh" -#include "engraver.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_; - Link_array note_spacings_; + vector note_spacings_; Spacings () { @@ -49,11 +55,11 @@ protected: Spanner *sep_span_; - virtual void acknowledge_grob (Grob_info); - virtual void process_music (); + DECLARE_ACKNOWLEDGER (item); + void process_music (); virtual void finalize (); - virtual void stop_translation_timestep (); - virtual void start_translation_timestep (); + void stop_translation_timestep (); + void start_translation_timestep (); public: TRANSLATOR_DECLARATIONS (Separating_line_group_engraver); }; @@ -68,7 +74,6 @@ Separating_line_group_engraver::Separating_line_group_engraver () void Separating_line_group_engraver::process_music () { - if (!sep_span_) { sep_span_ = make_spanner ("SeparatingGroupSpanner", SCM_EOL); @@ -88,7 +93,7 @@ Separating_line_group_engraver::finalize () sep_span_->set_bound (RIGHT, unsmob_grob (ccol)); sep_span_ = 0; - for (int i = 0; i < last_spacings_.note_spacings_.size (); i++) + 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"), @@ -97,20 +102,17 @@ Separating_line_group_engraver::finalize () if (last_spacings_.staff_spacing_ && last_spacings_.staff_spacing_->get_column () == column) - { - last_spacings_.staff_spacing_->suicide (); - } + 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_); - if (!it) - return; + Item *it = i.item (); if (it->get_parent (X_AXIS) - && it->get_parent (X_AXIS) - ->has_extent_callback (Axis_group_interface::group_extent_callback_proc, X_AXIS)) + && it->get_parent (X_AXIS) == it->get_parent (Y_AXIS) + && Axis_group_interface::has_axis (it->get_parent (X_AXIS), X_AXIS) + && Axis_group_interface::has_axis (it->get_parent (Y_AXIS), Y_AXIS)) return; if (to_boolean (it->get_property ("no-spacing-rods"))) @@ -118,11 +120,11 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i) if (Note_spacing::has_interface (it)) { - current_spacings_.note_spacings_.push (it); + current_spacings_.note_spacings_.push_back (it); return; } - bool ib = Item::is_breakable (it); + bool ib = Item::is_non_musical (it); Item *&p_ref_ (ib ? break_item_ : musical_item_); @@ -132,7 +134,7 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i) if (ib) { - p_ref_->set_property ("breakable", SCM_BOOL_T); + p_ref_->set_property ("non-musical", SCM_BOOL_T); context ()->set_property ("breakableSeparationItem", p_ref_->self_scm ()); } @@ -141,7 +143,8 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i) { Item *it = make_item ("StaffSpacing", SCM_EOL); current_spacings_.staff_spacing_ = it; - it->set_property ("left-items", scm_cons (break_item_->self_scm (), SCM_EOL)); + Pointer_group_interface::add_grob (it, ly_symbol2scm ("left-items"), + break_item_); if (int i = last_spacings_.note_spacings_.size ()) { @@ -149,12 +152,20 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i) Pointer_group_interface::add_grob (last_spacings_.note_spacings_[i], ly_symbol2scm ("right-items"), break_item_); - } else if (last_spacings_.staff_spacing_) { - last_spacings_.staff_spacing_->set_property ("right-items", - scm_cons (break_item_->self_scm (), SCM_EOL)); + 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_); } } } @@ -169,17 +180,17 @@ void Separating_line_group_engraver::start_translation_timestep () { if (break_item_) - context ()->unset_property (ly_symbol2scm ("breakableSeparationItem")); - break_item_ = 0; + { + context ()->unset_property (ly_symbol2scm ("breakableSeparationItem")); + break_item_ = 0; + } } void Separating_line_group_engraver::stop_translation_timestep () { if (break_item_) - { - Separating_group_spanner::add_spacing_unit (sep_span_, break_item_); - } + Separating_group_spanner::add_spacing_unit (sep_span_, break_item_); if (Item *sp = current_spacings_.staff_spacing_) { @@ -190,28 +201,26 @@ Separating_line_group_engraver::stop_translation_timestep () if (musical_item_) Pointer_group_interface::add_grob (sp, ly_symbol2scm ("right-items"), musical_item_); - } if (!current_spacings_.is_empty ()) - { - last_spacings_ = current_spacings_; - } + last_spacings_ = current_spacings_; current_spacings_.clear (); if (musical_item_) - { - Separating_group_spanner::add_spacing_unit (sep_span_, musical_item_); - } + Separating_group_spanner::add_spacing_unit (sep_span_, musical_item_); musical_item_ = 0; } +ADD_ACKNOWLEDGER (Separating_line_group_engraver, item); ADD_TRANSLATOR (Separating_line_group_engraver, - /* descr */ "Generates objects for computing spacing parameters.", - /* creats*/ "SeparationItem SeparatingGroupSpanner StaffSpacing", - /* accepts */ "", - /* acks */ "item-interface", - /* reads */ "createSpacing", + /* doc */ "Generates objects for computing spacing parameters.", + + /* create */ + "SeparationItem " + "SeparatingGroupSpanner " + "StaffSpacing", + /* read */ "createSpacing", /* write */ "breakableSeparationItem");