X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparating-line-group-engraver.cc;h=acaf1920b4c64c22beb22938fd58abf717661ee9;hb=98ca84585c45f75503adff82fc0a8cec2a105769;hp=57100c952ec5402b9439fca66beb55a8107ca6ae;hpb=8dbb0048c1ac59125562d5adc1c68512eab8541b;p=lilypond.git diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc index 57100c952e..acaf1920b4 100644 --- a/lily/separating-line-group-engraver.cc +++ b/lily/separating-line-group-engraver.cc @@ -3,17 +3,21 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2004 Han-Wen Nienhuys */ #include "separating-group-spanner.hh" #include "separation-item.hh" #include "paper-column.hh" -#include "paper-def.hh" +#include "output-def.hh" #include "engraver.hh" #include "axis-group-interface.hh" #include "note-spacing.hh" +#include "group-interface.hh" +#include "accidental-placement.hh" +#include "context.hh" + struct Spacings @@ -26,68 +30,78 @@ struct Spacings staff_spacing_ = 0; } - bool empty( )const + bool is_empty () const { return !staff_spacing_ && !note_spacings_.size (); } void clear () { staff_spacing_ = 0; - note_spacings_.clear(); + 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 * 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 (); public: - TRANSLATOR_DECLARATIONS(Separating_line_group_engraver); + TRANSLATOR_DECLARATIONS (Separating_line_group_engraver); }; 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_, 0); - sep_span_p_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn"))); -} + if (!sep_span_) + { + sep_span_ = make_spanner ("SeparatingGroupSpanner", SCM_EOL); + + sep_span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn"))); + } +} void Separating_line_group_engraver::finalize () { + if (!sep_span_) + return ; + SCM ccol = get_property ("currentCommandColumn"); - sep_span_p_->set_bound (RIGHT, unsmob_grob (ccol)); - typeset_grob (sep_span_p_); - sep_span_p_ =0; + Grob *column = unsmob_grob (ccol); + + sep_span_->set_bound (RIGHT, unsmob_grob (ccol)); + sep_span_ =0; - for (int i= 0 ; i < last_spacings_.note_spacings_.size(); i++) + 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)); + Pointer_group_interface::add_grob (last_spacings_.note_spacings_[i], + ly_symbol2scm ("right-items" ), + column); } - - if(last_spacings_.staff_spacing_ - && last_spacings_.staff_spacing_->column_l () == unsmob_grob (ccol)) + + if (last_spacings_.staff_spacing_ + && last_spacings_.staff_spacing_->get_column () == column) { last_spacings_.staff_spacing_->suicide (); } @@ -96,112 +110,119 @@ 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) && it->get_parent (X_AXIS) - ->has_extent_callback_b(Axis_group_interface::group_extent_callback_proc, X_AXIS)) + ->has_extent_callback (Axis_group_interface::group_extent_callback_proc, X_AXIS)) return; + + if (to_boolean (it->get_property ("no-spacing-rods"))) + 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_ - : 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); + { + p_ref_->set_property ("breakable", SCM_BOOL_T); + context ()->set_property ("breakableSeparationItem", p_ref_->self_scm ()); + } + - if (p_ref_ == break_malt_p_) + if (to_boolean (get_property ("createSpacing")) + && p_ref_ == break_item_) { - Item *it = new Item (get_property ("StaffSpacing")); + Item *it = make_item ("StaffSpacing", SCM_EOL); current_spacings_.staff_spacing_ = it; - it->set_grob_property ("left-items", gh_cons (break_malt_p_->self_scm (), SCM_EOL)); + it->set_property ("left-items", scm_cons (break_item_->self_scm (), SCM_EOL)); + - announce_grob (it, 0); if (int i = last_spacings_.note_spacings_.size ()) { - SCM break_malt = gh_cons (break_malt_p_->self_scm (), SCM_EOL); for (; i--;) - last_spacings_.note_spacings_[i] - ->set_grob_property ("right-items",break_malt); + 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_grob_property ("right-items", - gh_cons (break_malt_p_->self_scm(), SCM_EOL)); + last_spacings_.staff_spacing_->set_property ("right-items", + scm_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_) + context ()->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_); } - + if (Item * sp = current_spacings_.staff_spacing_) { /* TODO: should really look at the left-items of following note-spacing grobs. */ - if (musical_malt_p_) - sp->set_grob_property ("right-items", musical_malt_p_->self_scm()); + if (musical_item_) + Pointer_group_interface::add_grob (sp, ly_symbol2scm ("right-items"), + musical_item_); - typeset_grob (sp); } - if (!current_spacings_.empty ()) + + if (!current_spacings_.is_empty ()) { last_spacings_ = current_spacings_; } 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_); } - musical_malt_p_ =0; + musical_item_ =0; } - - - -ENTER_DESCRIPTION(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 */ ""); +/* creats*/ "SeparationItem SeparatingGroupSpanner StaffSpacing", +/* accepts */ "", +/* acks */ "item-interface", +/* reads */ "createSpacing", +/* write */ "breakableSeparationItem");