X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparating-line-group-engraver.cc;h=b2aeb9b2ab4e72fe492f84114cb1cd1e06cb59a2;hb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;hp=4abc0d3aafa1cfa28e6aa28f97a36efb5ae0c0f7;hpb=76f13ab50fc726c89fa7c96f3deed519d2d773dc;p=lilypond.git diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc index 4abc0d3aaf..b2aeb9b2ab 100644 --- a/lily/separating-line-group-engraver.cc +++ b/lily/separating-line-group-engraver.cc @@ -1,84 +1,226 @@ -/* - separating-line-group-grav.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--2000 Han-Wen Nienhuys - - */ -#include "separating-line-group-engraver.hh" + (c) 1998--2006 Han-Wen Nienhuys +*/ + +#include "engraver.hh" + #include "separating-group-spanner.hh" -#include "single-malt-grouping-item.hh" +#include "separation-item.hh" #include "paper-column.hh" -#include "paper-def.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_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 (); + void stop_translation_timestep (); + void start_translation_timestep (); +public: + TRANSLATOR_DECLARATIONS (Separating_line_group_engraver); +}; Separating_line_group_engraver::Separating_line_group_engraver () { - sep_span_p_ = 0; - break_malt_p_ = 0; - nobreak_malt_p_ =0; + sep_span_ = 0; + break_item_ = 0; + musical_item_ = 0; } void -Separating_line_group_engraver::do_creation_processing () +Separating_line_group_engraver::process_music () { - sep_span_p_ = new Separating_group_spanner (SCM_EOL); - announce_element (Score_element_info (sep_span_p_, 0)); - sep_span_p_->set_bound (LEFT, get_staff_info ().command_pcol_l ()); -} + 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::do_removal_processing () +Separating_line_group_engraver::finalize () { - sep_span_p_->set_bound (RIGHT, get_staff_info ().command_pcol_l ()); - typeset_element (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_element (Score_element_info i) +Separating_line_group_engraver::acknowledge_item (Grob_info i) { - Item * it = dynamic_cast (i.elem_l_); - if (it && !it->parent_l (X_AXIS)) + Item *it = i.item (); + if (it->get_parent (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"))) + return; + + if (Note_spacing::has_interface (it)) { - bool ib =it->breakable_b (); - Single_malt_grouping_item *&p_ref_ (ib ? break_malt_p_ - : nobreak_malt_p_); + current_spacings_.note_spacings_.push_back (it); + return; + } + + bool ib = Item::is_non_musical (it); + Item *&p_ref_ (ib ? break_item_ + : musical_item_); - if (!p_ref_) + if (!p_ref_) + { + p_ref_ = make_item ("SeparationItem", SCM_EOL); + + if (ib) { - p_ref_ - = new Single_malt_grouping_item - (get_property ("basicSingleMaltGroupingItemProperties")); - - if (ib) - p_ref_->set_elt_property ("breakable", SCM_BOOL_T); - announce_element (Score_element_info (p_ref_, 0)); + p_ref_->set_property ("non-musical", SCM_BOOL_T); + context ()->set_property ("breakableSeparationItem", p_ref_->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_); + } } - p_ref_->add_item (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::do_pre_move_processing () +Separating_line_group_engraver::start_translation_timestep () { - if (break_malt_p_) + if (break_item_) { - sep_span_p_->add_spacing_unit (break_malt_p_); - - typeset_element (break_malt_p_); - break_malt_p_ =0; + context ()->unset_property (ly_symbol2scm ("breakableSeparationItem")); + break_item_ = 0; } - if (nobreak_malt_p_) +} + +void +Separating_line_group_engraver::stop_translation_timestep () +{ + if (break_item_) + Separating_group_spanner::add_spacing_unit (sep_span_, break_item_); + + if (Item *sp = current_spacings_.staff_spacing_) { - sep_span_p_->add_spacing_unit (nobreak_malt_p_); - typeset_element (nobreak_malt_p_); - nobreak_malt_p_ =0; + /* + 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_); } -} + 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; +} -ADD_THIS_TRANSLATOR( Separating_line_group_engraver); +ADD_ACKNOWLEDGER (Separating_line_group_engraver, item); +ADD_TRANSLATOR (Separating_line_group_engraver, + /* doc */ "Generates objects for computing spacing parameters.", + /* create */ + "SeparationItem " + "SeparatingGroupSpanner " + "StaffSpacing", + /* read */ "createSpacing", + /* write */ "breakableSeparationItem");