#include "note-spacing.hh"
#include "group-interface.hh"
#include "accidental-placement.hh"
-#include "translator-group.hh"
+#include "context.hh"
+
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 ();
}
};
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_ = make_spanner ("SeparatingGroupSpanner");
- announce_grob(sep_span_, SCM_EOL);
+ announce_grob (sep_span_, SCM_EOL);
sep_span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
}
}
typeset_grob (sep_span_);
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" ),
column);
}
- if(last_spacings_.staff_spacing_
+ if (last_spacings_.staff_spacing_
&& last_spacings_.staff_spacing_->get_column () == column)
{
last_spacings_.staff_spacing_->suicide ();
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")))
+ if (to_boolean (it->get_property ("no-spacing-rods")))
return ;
if (Note_spacing::has_interface (it))
return ;
}
- bool ib =Item::breakable_b (it);
+ bool ib =Item::is_breakable (it);
Item *&p_ref_ (ib ? break_item_
: musical_item_);
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);
+ daddy_context_->set_property ("breakableSeparationItem", p_ref_->self_scm ());
}
- announce_grob(p_ref_, SCM_EOL);
+ 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");
current_spacings_.staff_spacing_ = it;
- it->set_grob_property ("left-items", gh_cons (break_item_->self_scm (), SCM_EOL));
+ it->set_property ("left-items", gh_cons (break_item_->self_scm (), SCM_EOL));
- announce_grob(it, SCM_EOL);
+ announce_grob (it, SCM_EOL);
if (int i = last_spacings_.note_spacings_.size ())
{
}
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",
+ gh_cons (break_item_->self_scm (), SCM_EOL));
}
}
}
Separating_line_group_engraver::start_translation_timestep ()
{
if (break_item_)
- daddy_trans_->unset_property (ly_symbol2scm ("breakableSeparationItem"));
+ daddy_context_->unset_property (ly_symbol2scm ("breakableSeparationItem"));
break_item_ =0;
}
}
- if (!current_spacings_.empty ())
+ if (!current_spacings_.is_empty ())
{
last_spacings_ = current_spacings_;
}
}
-ENTER_DESCRIPTION(Separating_line_group_engraver,
+ENTER_DESCRIPTION (Separating_line_group_engraver,
/* descr */ "Generates objects for computing spacing parameters.",
-/* creats*/ "SeparationItem SeparatingGroupSpanner",
+/* creats*/ "SeparationItem SeparatingGroupSpanner StaffSpacing",
/* accepts */ "",
/* acks */ "item-interface",
-/* reads */ "",
+/* reads */ "createSpacing",
/* write */ "breakableSeparationItem");