X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparating-line-group-engraver.cc;h=c63ff065ed7f76764332339dcd7677dd9ab803fc;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=28510166dce2ad889257c42168d092549b10515f;hpb=c373de38a49dea998a0733658a48a0e62912fa11;p=lilypond.git diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc index 28510166dc..c63ff065ed 100644 --- a/lily/separating-line-group-engraver.cc +++ b/lily/separating-line-group-engraver.cc @@ -1,9 +1,20 @@ /* - separating-line-group-engraver.cc -- implement Separating_line_group_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1998--2014 Han-Wen Nienhuys - (c) 1998--2007 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "engraver.hh" @@ -24,7 +35,7 @@ struct Spacings { Item *staff_spacing_; - vector note_spacings_; + vector note_spacings_; Spacings () { @@ -45,38 +56,27 @@ struct Spacings class Separating_line_group_engraver : public Engraver { protected: - Item *break_item_; - Item *musical_item_; - Item *last_musical_item_; - Spacings current_spacings_; Spacings last_spacings_; DECLARE_ACKNOWLEDGER (item); + DECLARE_ACKNOWLEDGER (break_aligned); void stop_translation_timestep (); void start_translation_timestep (); + + vector break_aligned_; public: TRANSLATOR_DECLARATIONS (Separating_line_group_engraver); }; Separating_line_group_engraver::Separating_line_group_engraver () { - break_item_ = 0; - musical_item_ = 0; } void Separating_line_group_engraver::acknowledge_item (Grob_info i) { 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)) { @@ -84,91 +84,88 @@ Separating_line_group_engraver::acknowledge_item (Grob_info i) return; } - bool ib = Item::is_non_musical (it); - Item *&p_ref_ (ib ? break_item_ - : musical_item_); - - if (!p_ref_) + if (Item::is_non_musical (it) + && !current_spacings_.staff_spacing_ + && to_boolean (get_property ("createSpacing"))) { - p_ref_ = make_item ("SeparationItem", SCM_EOL); - - if (ib) - { - 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 (!last_spacings_.note_spacings_.size () - && 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_); - } - } + Grob *col = Grob::unsmob (get_property ("currentCommandColumn")); + + current_spacings_.staff_spacing_ = make_item ("StaffSpacing", SCM_EOL); + context ()->set_property ("hasStaffSpacing", SCM_BOOL_T); + + Pointer_group_interface::add_grob (current_spacings_.staff_spacing_, + ly_symbol2scm ("left-items"), + col); + + if (!last_spacings_.note_spacings_.size () + && last_spacings_.staff_spacing_) + { + SCM ri = last_spacings_.staff_spacing_->get_object ("right-items"); + Grob_array *ga = Grob_array::unsmob (ri); + if (!ga) + { + SCM ga_scm = Grob_array::make_array (); + last_spacings_.staff_spacing_->set_object ("right-items", ga_scm); + ga = Grob_array::unsmob (ga_scm); + } + + ga->clear (); + ga->add (col); + } } +} - 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::acknowledge_break_aligned (Grob_info gi) +{ + break_aligned_.push_back (gi.grob ()); } 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 ("hasStaffSpacing")); } void Separating_line_group_engraver::stop_translation_timestep () { - if (Item *sp = current_spacings_.staff_spacing_) + for (vsize i = 0; i < break_aligned_.size (); i++) { - /* - 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_); + SCM smob = break_aligned_[i]->self_scm (); + + if (Item *sp = current_spacings_.staff_spacing_) + Pointer_group_interface::add_grob (sp, ly_symbol2scm ("left-break-aligned"), smob); + + for (vsize j = 0; j < last_spacings_.note_spacings_.size (); j++) + Pointer_group_interface::add_grob (last_spacings_.note_spacings_[j], + ly_symbol2scm ("right-break-aligned"), smob); } if (!current_spacings_.is_empty ()) last_spacings_ = current_spacings_; - current_spacings_.clear (); + if (Item *sp = current_spacings_.staff_spacing_) + if (Grob *col = Grob::unsmob (get_property ("currentMusicalColumn"))) + Pointer_group_interface::add_grob (sp, ly_symbol2scm ("right-items"), col); - musical_item_ = 0; + current_spacings_.clear (); + break_aligned_.clear (); } ADD_ACKNOWLEDGER (Separating_line_group_engraver, item); +ADD_ACKNOWLEDGER (Separating_line_group_engraver, break_aligned); + ADD_TRANSLATOR (Separating_line_group_engraver, - /* doc */ "Generates objects for computing spacing parameters.", - - /* create */ - "SeparationItem " - "SeparatingGroupSpanner " - "StaffSpacing", - /* read */ "createSpacing", - /* write */ "breakableSeparationItem"); + /* doc */ + "Generate objects for computing spacing parameters.", + + /* create */ + "StaffSpacing ", + + /* read */ + "createSpacing ", + + /* write */ + "hasStaffSpacing " + );