-/*
-' 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 <hanwen@cs.uu.nl>
-
- */
+
+ (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
+#include "engraver.hh"
#include "separating-group-spanner.hh"
#include "separation-item.hh"
#include "paper-column.hh"
-#include "paper-def.hh"
-#include "engraver.hh"
+#include "output-def.hh"
#include "axis-group-interface.hh"
#include "note-spacing.hh"
-#include "group-interface.hh"
#include "accidental-placement.hh"
#include "context.hh"
+#include "grob-array.hh"
+#include "pointer-group-interface.hh"
-
+#include "translator.icc"
struct Spacings
{
- Item * staff_spacing_;
- Link_array<Item> note_spacings_;
+ Item *staff_spacing_;
+ vector<Item*> note_spacings_;
Spacings ()
{
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 ();
}
};
-
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_;
-
- virtual void acknowledge_grob (Grob_info);
- virtual void process_music ();
+
+ Spanner *sep_span_;
+
+ DECLARE_ACKNOWLEDGER (item);
+ void process_music ();
virtual void finalize ();
- virtual void stop_translation_timestep ();
- virtual void start_translation_timestep ();
+ void stop_translation_timestep ();
+ void start_translation_timestep ();
public:
TRANSLATOR_DECLARATIONS (Separating_line_group_engraver);
};
{
sep_span_ = 0;
break_item_ = 0;
- musical_item_ =0;
+ musical_item_ = 0;
}
void
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")));
}
}
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 (vsize 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)
- {
- last_spacings_.staff_spacing_->suicide ();
- }
+ && last_spacings_.staff_spacing_->get_column () == column)
+ last_spacings_.staff_spacing_->suicide ();
}
void
-Separating_line_group_engraver::acknowledge_grob (Grob_info i)
+Separating_line_group_engraver::acknowledge_item (Grob_info i)
{
- Item * it = dynamic_cast <Item *> (i.grob_);
+ Item *it = dynamic_cast<Item *> (i.grob ());
if (!it)
return;
if (it->get_parent (X_AXIS)
- && it->get_parent (X_AXIS)
- ->has_extent_callback (Axis_group_interface::group_extent_callback_proc, X_AXIS))
+ && Axis_group_interface::has_axis (it->get_parent (X_AXIS), X_AXIS))
return;
-
if (to_boolean (it->get_property ("no-spacing-rods")))
- return ;
+ return;
- if (Note_spacing::has_interface (it))
+ if (Note_spacing::has_interface (it))
{
- current_spacings_.note_spacings_.push (it);
- return ;
+ current_spacings_.note_spacings_.push_back (it);
+ return;
}
-
- bool ib =Item::is_breakable (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_property ("breakable", SCM_BOOL_T);
- daddy_context_->set_property ("breakableSeparationItem", p_ref_->self_scm ());
+ context ()->set_property ("breakableSeparationItem", p_ref_->self_scm ());
}
- announce_grob (p_ref_, SCM_EOL);
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_property ("left-items", gh_cons (break_item_->self_scm (), SCM_EOL));
-
- announce_grob (it, SCM_EOL);
+ Pointer_group_interface::add_grob (it, ly_symbol2scm ("left-items"),
+ break_item_);
if (int i = last_spacings_.note_spacings_.size ())
{
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_property ("right-items",
- gh_cons (break_item_->self_scm (), SCM_EOL));
+ 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_);
}
}
}
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_context_->unset_property (ly_symbol2scm ("breakableSeparationItem"));
- break_item_ =0;
+ {
+ context ()->unset_property (ly_symbol2scm ("breakableSeparationItem"));
+ break_item_ = 0;
+ }
}
void
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_)
+ Separating_group_spanner::add_spacing_unit (sep_span_, break_item_);
+
+ 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_.is_empty ())
- {
- last_spacings_ = current_spacings_;
- }
+ 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;
-}
+ Separating_group_spanner::add_spacing_unit (sep_span_, musical_item_);
+ musical_item_ = 0;
+}
-ENTER_DESCRIPTION (Separating_line_group_engraver,
-/* descr */ "Generates objects for computing spacing parameters.",
-/* creats*/ "SeparationItem SeparatingGroupSpanner StaffSpacing",
-/* accepts */ "",
-/* acks */ "item-interface",
-/* reads */ "createSpacing",
-/* write */ "breakableSeparationItem");
+ADD_ACKNOWLEDGER (Separating_line_group_engraver, item);
+ADD_TRANSLATOR (Separating_line_group_engraver,
+ /* doc */ "Generates objects for computing spacing parameters.",
+
+ /* create */
+ "SeparationItem "
+ "SeparatingGroupSpanner "
+ "StaffSpacing",
+ /* accept */ "",
+ /* read */ "createSpacing",
+ /* write */ "breakableSeparationItem");
projects / lilypond.git / blobdiff