-/*
-' 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
-#include "separating-group-spanner.hh"
+ (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
+#include "engraver.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 "spanner.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 ()
{
staff_spacing_ = 0;
}
- bool empty( )const
+ 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();
+ note_spacings_.clear ();
}
};
class Separating_line_group_engraver : public Engraver
{
protected:
- Item * break_malt_p_;
- Item * musical_malt_p_;
- Item * last_musical_malt_p_;
-
Spacings current_spacings_;
Spacings last_spacings_;
-
- Spanner * sep_span_p_;
-
- virtual void acknowledge_grob (Grob_info);
- virtual void initialize ();
- virtual void finalize ();
- virtual void stop_translation_timestep ();
- virtual void start_translation_timestep ();
+
+ DECLARE_ACKNOWLEDGER (item);
+ DECLARE_ACKNOWLEDGER (break_aligned);
+ void stop_translation_timestep ();
+ void start_translation_timestep ();
+
+ vector<Grob*> break_aligned_;
public:
- TRANSLATOR_DECLARATIONS(Separating_line_group_engraver);
+ TRANSLATOR_DECLARATIONS (Separating_line_group_engraver);
};
Separating_line_group_engraver::Separating_line_group_engraver ()
{
- sep_span_p_ = 0;
- break_malt_p_ = 0;
- musical_malt_p_ =0;
}
void
-Separating_line_group_engraver::initialize ()
+Separating_line_group_engraver::acknowledge_item (Grob_info i)
{
- sep_span_p_ = new Spanner (get_property ("SeparatingGroupSpanner"));
-
- announce_grob (sep_span_p_, 0);
- sep_span_p_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
-}
-
-void
-Separating_line_group_engraver::finalize ()
-{
- SCM ccol = get_property ("currentCommandColumn");
- 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));
- }
-
- if(last_spacings_.staff_spacing_
- && last_spacings_.staff_spacing_->column_l () == unsmob_grob (ccol))
- {
- last_spacings_.staff_spacing_->suicide ();
- }
-}
+ Item *it = i.item ();
-void
-Separating_line_group_engraver::acknowledge_grob (Grob_info i)
-{
- Item * it = dynamic_cast <Item *> (i.grob_l_);
- if (!it)
- 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))
- 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::breakable_b (it);
- Item *&p_ref_ (ib ? break_malt_p_
- : musical_malt_p_);
- if (!p_ref_)
+ if (Item::is_non_musical (it)
+ && !current_spacings_.staff_spacing_
+ && to_boolean (get_property ("createSpacing")))
{
- p_ref_ = new Item (get_property ("SeparationItem"));
+ Grob *col = unsmob_grob (get_property ("currentCommandColumn"));
- if (ib)
- p_ref_->set_grob_property ("breakable", SCM_BOOL_T);
- announce_grob (p_ref_, 0);
+ current_spacings_.staff_spacing_ = make_item ("StaffSpacing", SCM_EOL);
+ context ()->set_property ("hasStaffSpacing", SCM_BOOL_T);
- if (p_ref_ == break_malt_p_)
+ Pointer_group_interface::add_grob (current_spacings_.staff_spacing_,
+ ly_symbol2scm ("left-items"),
+ col);
+
+ if (!last_spacings_.note_spacings_.size ()
+ && last_spacings_.staff_spacing_)
{
- Item *it = new Item (get_property ("StaffSpacing"));
- current_spacings_.staff_spacing_ = it;
- it->set_grob_property ("left-items", gh_cons (break_malt_p_->self_scm (), SCM_EOL));
-
- announce_grob (it, 0);
-
- 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_malt_p_);
-
- }
- 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)
{
-
- last_spacings_.staff_spacing_->set_grob_property ("right-items",
- gh_cons (break_malt_p_->self_scm(), SCM_EOL));
+ 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 (col);
}
}
+}
- 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 ()
{
-
+ context ()->unset_property (ly_symbol2scm ("hasStaffSpacing"));
}
void
Separating_line_group_engraver::stop_translation_timestep ()
{
- if (break_malt_p_)
+ for (vsize i = 0; i < break_aligned_.size (); i++)
{
- Separating_group_spanner::add_spacing_unit (sep_span_p_, break_malt_p_);
- typeset_grob (break_malt_p_);
+ SCM smob = break_aligned_[i]->self_scm ();
- break_malt_p_ =0;
- }
+ if (Item *sp = current_spacings_.staff_spacing_)
+ Pointer_group_interface::add_grob (sp, ly_symbol2scm ("left-break-aligned"), smob);
- if (Item * sp = current_spacings_.staff_spacing_)
- {
- /*
- TODO: should really look at the left-items of following
- note-spacing grobs.
- */
- if (musical_malt_p_)
- Pointer_group_interface::add_grob (sp, ly_symbol2scm ("right-items"),
- musical_malt_p_);
-
- typeset_grob (sp);
+ 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_.empty ())
- {
- last_spacings_ = current_spacings_;
- }
+ if (!current_spacings_.is_empty ())
+ last_spacings_ = current_spacings_;
+
+ if (Item *sp = current_spacings_.staff_spacing_)
+ if (Grob *col = unsmob_grob (get_property ("currentMusicalColumn")))
+ Pointer_group_interface::add_grob (sp, ly_symbol2scm ("right-items"), col);
current_spacings_.clear ();
-
- if (musical_malt_p_)
- {
- Separating_group_spanner::add_spacing_unit (sep_span_p_, musical_malt_p_);
- typeset_grob (musical_malt_p_);
- }
-
- musical_malt_p_ =0;
+ 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 */
+ "Generate objects for computing spacing parameters.",
+ /* create */
+ "StaffSpacing ",
+ /* read */
+ "createSpacing ",
-ENTER_DESCRIPTION(Separating_line_group_engraver,
-/* descr */ "Generates objects for computing spacing parameters.",
-/* creats*/ "SeparationItem SeparatingGroupSpanner",
-/* acks */ "grob-interface",
-/* reads */ "",
-/* write */ "");
+ /* write */
+ "hasStaffSpacing "
+ );
projects / lilypond.git / blobdiff