X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparating-line-group-engraver.cc;h=3d28bb3c4fe9d92f4d5bdfb20d692b3be347d1fb;hb=7de4eefd86a8413d032e64ebd6304bfb9aa2645d;hp=6bcd774ed87455cd057543db2b7660878e1d6834;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc index 6bcd774ed8..3d28bb3c4f 100644 --- a/lily/separating-line-group-engraver.cc +++ b/lily/separating-line-group-engraver.cc @@ -1,27 +1,24 @@ -/* -' 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--2004 Han-Wen Nienhuys - - */ + + (c) 1998--2005 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 "translator-group.hh" - +#include "context.hh" struct Spacings { - Item * staff_spacing_; + Item *staff_spacing_; Link_array note_spacings_; Spacings () @@ -29,43 +26,43 @@ struct Spacings staff_spacing_ = 0; } - bool empty( )const + bool is_empty () const { - return !staff_spacing_ && !note_spacings_.size (); + return !staff_spacing_ && !note_spacings_.size (); } - void clear () { + void clear () + { staff_spacing_ = 0; - note_spacings_.clear(); + note_spacings_.clear (); } }; - class Separating_line_group_engraver : public Engraver { protected: - Item * break_item_; - Item * musical_item_; - Item * last_musical_item_; + Item *break_item_; + Item *musical_item_; + Item *last_musical_item_; Spacings current_spacings_; Spacings last_spacings_; - - Spanner * sep_span_; - + + Spanner *sep_span_; + virtual void acknowledge_grob (Grob_info); virtual void process_music (); virtual void finalize (); virtual void stop_translation_timestep (); - virtual void start_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_ = 0; break_item_ = 0; - musical_item_ =0; + musical_item_ = 0; } void @@ -74,9 +71,8 @@ Separating_line_group_engraver::process_music () if (!sep_span_) { - sep_span_ = make_spanner ("SeparatingGroupSpanner"); + sep_span_ = make_spanner ("SeparatingGroupSpanner", SCM_EOL); - announce_grob(sep_span_, SCM_EOL); sep_span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn"))); } } @@ -84,24 +80,23 @@ void Separating_line_group_engraver::finalize () { if (!sep_span_) - return ; - + return; + SCM ccol = get_property ("currentCommandColumn"); Grob *column = unsmob_grob (ccol); - + sep_span_->set_bound (RIGHT, unsmob_grob (ccol)); - typeset_grob (sep_span_); - sep_span_ =0; + 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++) { Pointer_group_interface::add_grob (last_spacings_.note_spacings_[i], - ly_symbol2scm ("right-items" ), + ly_symbol2scm ("right-items"), column); } - - if(last_spacings_.staff_spacing_ - && last_spacings_.staff_spacing_->get_column () == column) + + if (last_spacings_.staff_spacing_ + && last_spacings_.staff_spacing_->get_column () == column) { last_spacings_.staff_spacing_->suicide (); } @@ -110,46 +105,43 @@ Separating_line_group_engraver::finalize () void Separating_line_group_engraver::acknowledge_grob (Grob_info i) { - Item * it = dynamic_cast (i.grob_); + 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_grob_property ("no-spacing-rods"))) - return ; + if (to_boolean (it->get_property ("no-spacing-rods"))) + return; - if (Note_spacing::has_interface (it)) + if (Note_spacing::has_interface (it)) { current_spacings_.note_spacings_.push (it); - return ; + return; } - - bool ib =Item::breakable_b (it); + + bool ib = Item::is_breakable (it); Item *&p_ref_ (ib ? break_item_ : musical_item_); if (!p_ref_) { - p_ref_ = make_item ("SeparationItem"); + p_ref_ = make_item ("SeparationItem", SCM_EOL); if (ib) { - p_ref_->set_grob_property ("breakable", SCM_BOOL_T); - daddy_trans_->set_property ("breakableSeparationItem", p_ref_->self_scm ()); + p_ref_->set_property ("breakable", SCM_BOOL_T); + context ()->set_property ("breakableSeparationItem", p_ref_->self_scm ()); } - announce_grob(p_ref_, SCM_EOL); - if (p_ref_ == break_item_) + if (to_boolean (get_property ("createSpacing")) + && p_ref_ == break_item_) { - Item *it = make_item ("StaffSpacing"); + Item *it = make_item ("StaffSpacing", SCM_EOL); current_spacings_.staff_spacing_ = it; - it->set_grob_property ("left-items", gh_cons (break_item_->self_scm (), SCM_EOL)); - - announce_grob(it, SCM_EOL); + it->set_property ("left-items", scm_cons (break_item_->self_scm (), SCM_EOL)); if (int i = last_spacings_.note_spacings_.size ()) { @@ -157,13 +149,11 @@ 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_grob_property ("right-items", - gh_cons (break_item_->self_scm(), SCM_EOL)); + last_spacings_.staff_spacing_->set_property ("right-items", + scm_cons (break_item_->self_scm (), SCM_EOL)); } } } @@ -171,15 +161,15 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i) if (Accidental_placement::has_interface (it)) Separation_item::add_conditional_item (p_ref_, it); else - Separation_item::add_item (p_ref_,it); + Separation_item::add_item (p_ref_, it); } void Separating_line_group_engraver::start_translation_timestep () { if (break_item_) - daddy_trans_->unset_property (ly_symbol2scm ("breakableSeparationItem")); - break_item_ =0; + context ()->unset_property (ly_symbol2scm ("breakableSeparationItem")); + break_item_ = 0; } void @@ -188,44 +178,38 @@ Separating_line_group_engraver::stop_translation_timestep () if (break_item_) { Separating_group_spanner::add_spacing_unit (sep_span_, break_item_); - typeset_grob (break_item_); } - - if (Item * sp = current_spacings_.staff_spacing_) + + if (Item *sp = current_spacings_.staff_spacing_) { /* 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_); - - typeset_grob (sp); } - - if (!current_spacings_.empty ()) + 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_); - typeset_grob (musical_item_); } - - musical_item_ =0; -} + musical_item_ = 0; +} -ENTER_DESCRIPTION(Separating_line_group_engraver, -/* descr */ "Generates objects for computing spacing parameters.", -/* creats*/ "SeparationItem SeparatingGroupSpanner", -/* accepts */ "", -/* acks */ "item-interface", -/* reads */ "", -/* write */ "breakableSeparationItem"); +ADD_TRANSLATOR (Separating_line_group_engraver, + /* descr */ "Generates objects for computing spacing parameters.", + /* creats*/ "SeparationItem SeparatingGroupSpanner StaffSpacing", + /* accepts */ "", + /* acks */ "item-interface", + /* reads */ "createSpacing", + /* write */ "breakableSeparationItem");