(c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include <iostream.h>
#include "separating-group-spanner.hh"
#include "separation-item.hh"
#include "paper-def.hh"
#include "engraver.hh"
#include "axis-group-interface.hh"
+#include "note-spacing.hh"
class Separating_line_group_engraver : public Engraver
{
protected:
Item * break_malt_p_;
Item * musical_malt_p_;
+ Item * last_musical_malt_p_;
- /*
- malt_p_ : we used to have a Single_malt_grouping_item
-
- */
- Item * last_step_musical_malt_p_;
- Item * last_nonnil_musical_malt_p_;
- Item * last_nonnil_break_malt_p_;
+ Item * last_note_spacing_;
+ Item * current_note_spacing_;
+ Item * staff_spacing_;
Spanner * sep_span_p_;
virtual void finalize ();
virtual void stop_translation_timestep ();
public:
- Separating_line_group_engraver ();
- VIRTUAL_COPY_CONS (Translator);
+ TRANSLATOR_DECLARATIONS(Separating_line_group_engraver);
};
Separating_line_group_engraver::Separating_line_group_engraver ()
{
- last_step_musical_malt_p_ = 0;
- last_nonnil_break_malt_p_ = 0;
- last_nonnil_musical_malt_p_ = 0;
+ last_note_spacing_ = 0;
+ current_note_spacing_ = 0;
+ staff_spacing_ =0;
sep_span_p_ = 0;
break_malt_p_ = 0;
void
Separating_line_group_engraver::acknowledge_grob (Grob_info i)
{
- Item * it = dynamic_cast <Item *> (i.elem_l_);
+ Item * it = dynamic_cast <Item *> (i.grob_l_);
if (!it)
return;
- if (it->parent_l (X_AXIS)
- && it->parent_l (X_AXIS)->has_extent_callback_b
- (Axis_group_interface::group_extent_callback_proc, X_AXIS))
+ 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))
+ {
+ current_note_spacing_ = it;
+ return ;
+ }
bool ib =Item::breakable_b (it);
Item *&p_ref_ (ib ? break_malt_p_
if (!p_ref_)
{
- p_ref_ = new Item
- (get_property ("SeparationItem"));
-
+ p_ref_ = new Item (get_property ("SeparationItem"));
+
if (ib)
p_ref_->set_grob_property ("breakable", SCM_BOOL_T);
announce_grob (p_ref_, 0);
+
+ if (p_ref_ == break_malt_p_)
+ {
+ staff_spacing_ = new Item (get_property ("StaffSpacing"));
+ staff_spacing_->set_grob_property ("left-item", break_malt_p_->self_scm ());
+ announce_grob (staff_spacing_, 0);
+
+ if (last_note_spacing_)
+ last_note_spacing_->set_grob_property ("right-item",
+ break_malt_p_->self_scm ());
+ }
}
+
Separation_item::add_item (p_ref_,it);
}
if (break_malt_p_)
{
Separating_group_spanner::add_spacing_unit (sep_span_p_, break_malt_p_);
-
typeset_grob (break_malt_p_);
- last_nonnil_break_malt_p_ = break_malt_p_;
break_malt_p_ =0;
}
+ if (staff_spacing_)
+ {
+ if (musical_malt_p_)
+ staff_spacing_->set_grob_property ("right-item", musical_malt_p_->self_scm());
+
+ typeset_grob (staff_spacing_);
+ staff_spacing_ = 0;
+ }
+
if (musical_malt_p_)
{
Separating_group_spanner::add_spacing_unit (sep_span_p_, musical_malt_p_);
-
-
- /* TODO
-
- move this mucketry into separation-spanner.
-
- */
- if (last_nonnil_break_malt_p_ && last_nonnil_musical_malt_p_)
- {
- cout << now_mom ().str () <<endl;
- Item *col = last_nonnil_break_malt_p_->column_l();
- if (!col)
- col = dynamic_cast<Item*> (unsmob_grob (get_property ("currentCommandColumn")));
-
- SCM between = col->get_grob_property ("between-cols");
-
- SCM left = last_nonnil_musical_malt_p_->column_l()->self_scm ();
- SCM right = get_property ("currentMusicalColumn"); // musical_malt_p_->column_l()->self_scm ();
- if (gh_pair_p (between))
- {
- /*
- ugh. set_..._x ()
- */
- if (Paper_column::rank_i (unsmob_grob (gh_car (between))) < Paper_column::rank_i (unsmob_grob (left)))
- gh_set_car_x (between, left);
- if (Paper_column::rank_i (unsmob_grob (gh_cdr (between))) > Paper_column::rank_i (unsmob_grob (right)))
- gh_set_cdr_x (between, right);
- }
- else
- {
- col->set_grob_property ("between-cols", gh_cons (left, right));
- }
- }
-
- if (last_step_musical_malt_p_)
- {
- Paper_column *col =
- last_step_musical_malt_p_->column_l();
- SCM newtup = gh_cons (last_step_musical_malt_p_->self_scm (),
- musical_malt_p_->self_scm ());
- col->set_grob_property ("spacing-sequence",
- gh_cons (newtup,
- col->get_grob_property ("spacing-sequence")));
- }
-
-
-
- last_nonnil_break_malt_p_ = 0;
- last_nonnil_musical_malt_p_ = musical_malt_p_;
typeset_grob (musical_malt_p_);
}
- last_step_musical_malt_p_ = musical_malt_p_;
- musical_malt_p_ =0;
+ last_note_spacing_ = current_note_spacing_ ;
+ current_note_spacing_ =0 ;
+
+ musical_malt_p_ =0;
}
-ADD_THIS_TRANSLATOR (Separating_line_group_engraver);
+
+ENTER_DESCRIPTION(Separating_line_group_engraver,
+/* descr */ "Generates objects for computing spacing parameters.",
+/* creats*/ "SeparationItem SeparatingGroupSpanner",
+/* acks */ "grob-interface",
+/* reads */ "",
+/* write */ "");