source file of the GNU LilyPond music typesetter
- (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "engraver.hh"
#include "axis-group-interface.hh"
#include "note-spacing.hh"
-
+#include "group-interface.hh"
+#include "accidental-placement.hh"
struct Spacings
{
{
sep_span_p_ = new Spanner (get_property ("SeparatingGroupSpanner"));
- announce_grob (sep_span_p_, 0);
+ announce_grob(sep_span_p_, SCM_EOL);
sep_span_p_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
}
Separating_line_group_engraver::finalize ()
{
SCM ccol = get_property ("currentCommandColumn");
+ Grob *column = unsmob_grob (ccol);
+
sep_span_p_->set_bound (RIGHT, unsmob_grob (ccol));
typeset_grob (sep_span_p_);
sep_span_p_ =0;
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))
+ && last_spacings_.staff_spacing_->column_l () == column)
{
last_spacings_.staff_spacing_->suicide ();
}
->has_extent_callback_b(Axis_group_interface::group_extent_callback_proc, X_AXIS))
return;
+
+ if (to_boolean (it->get_grob_property ("no-spacing-rods")))
+ return ;
+
if (Note_spacing::has_interface (it))
{
current_spacings_.note_spacings_.push (it);
if (ib)
p_ref_->set_grob_property ("breakable", SCM_BOOL_T);
- announce_grob (p_ref_, 0);
+ announce_grob(p_ref_, SCM_EOL);
if (p_ref_ == break_malt_p_)
{
current_spacings_.staff_spacing_ = it;
it->set_grob_property ("left-items", gh_cons (break_malt_p_->self_scm (), SCM_EOL));
- announce_grob (it, 0);
+ announce_grob(it, SCM_EOL);
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_malt_p_);
}
else if (last_spacings_.staff_spacing_)
}
}
- 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
break_malt_p_ =0;
}
-
+
if (Item * sp = current_spacings_.staff_spacing_)
{
/*
note-spacing grobs.
*/
if (musical_malt_p_)
- sp->set_grob_property ("right-items", musical_malt_p_->self_scm());
+ Pointer_group_interface::add_grob (sp, ly_symbol2scm ("right-items"),
+ musical_malt_p_);
typeset_grob (sp);
}
+
if (!current_spacings_.empty ())
{
last_spacings_ = current_spacings_;
}
-
-
-
ENTER_DESCRIPTION(Separating_line_group_engraver,
/* descr */ "Generates objects for computing spacing parameters.",
/* creats*/ "SeparationItem SeparatingGroupSpanner",
-/* acks */ "grob-interface",
+/* acks */ "item-interface",
/* reads */ "",
/* write */ "");