source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "spanner.hh"
{
protected:
Spanner *staffline_p_;
- Link_array<Score_element> elts_;
- virtual void do_creation_processing();
- virtual void do_removal_processing();
- virtual void acknowledge_element (Score_element_info);
- virtual void process_acknowledged ();
+ Link_array<Grob> elts_;
+ virtual void initialize ();
+ virtual void finalize ();
+ virtual void acknowledge_grob (Grob_info);
+ virtual void create_grobs ();
virtual Spanner* get_spanner_p () const;
- virtual void add_element (Score_element*) ;
-public:
-
- VIRTUAL_COPY_CONS(Translator);
+ virtual void add_element (Grob*) ;
+public:
+ VIRTUAL_COPY_CONS (Translator);
Axis_group_engraver ();
};
-ADD_THIS_TRANSLATOR(Axis_group_engraver);
+ADD_THIS_TRANSLATOR (Axis_group_engraver);
Axis_group_engraver::Axis_group_engraver ()
{
}
void
-Axis_group_engraver::do_creation_processing ()
+Axis_group_engraver::initialize ()
{
staffline_p_ = get_spanner_p ();
Axis_group_interface::set_interface (staffline_p_);
Axis_group_interface::set_axes (staffline_p_, Y_AXIS, Y_AXIS);
- Score_element * it = unsmob_element (get_property ("currentCommandColumn"));
- Pointer_group_interface (it, "bounded-by-me").add_element (staffline_p_);
- staffline_p_->set_bound(LEFT,it);
+ Grob * it = unsmob_grob (get_property ("currentCommandColumn"));
+
+ staffline_p_->set_bound (LEFT,it);
- announce_element (staffline_p_, 0);
+ announce_grob (staffline_p_, 0);
}
Spanner*
Axis_group_engraver::get_spanner_p () const
{
- return new Spanner (get_property ("basicVerticalAxisGroupProperties"));
+ return new Spanner (get_property ("VerticalAxisGroup"));
}
void
-Axis_group_engraver::do_removal_processing ()
+Axis_group_engraver::finalize ()
{
String type = daddy_grav_l ()->type_str_ ;
- SCM dims = get_property ((type + "VerticalExtent").ch_C());
+ SCM dims = get_property ("VerticalExtent");
if (gh_pair_p (dims) && gh_number_p (gh_car (dims))
&& gh_number_p (gh_cdr (dims)))
{
- staffline_p_->set_extent_callback (&Score_element::preset_extent, Y_AXIS);
- staffline_p_->set_elt_property ("extent-Y", dims);
+ staffline_p_->set_extent_callback (Grob::preset_extent_proc, Y_AXIS);
+ staffline_p_->set_grob_property ("extent-Y", dims);
}
- dims = get_property ((type + "MinimumVerticalExtent").ch_C());
+ dims = get_property ("MinimumVerticalExtent");
if (gh_pair_p (dims) && gh_number_p (gh_car (dims))
&& gh_number_p (gh_cdr (dims)))
- staffline_p_->set_elt_property ("minimum-extent-Y", dims);
+ staffline_p_->set_grob_property ("minimum-extent-Y", dims);
- dims = get_property ((type + "ExtraVerticalExtent").ch_C());
+ dims = get_property ("ExtraVerticalExtent");
if (gh_pair_p (dims) && gh_number_p (gh_car (dims))
&& gh_number_p (gh_cdr (dims)))
- staffline_p_->set_elt_property ("extra-extent-Y", dims);
+ staffline_p_->set_grob_property ("extra-extent-Y", dims);
-Score_element * it = unsmob_element (get_property ("currentCommandColumn"));
+ Grob * it = unsmob_grob (get_property ("currentCommandColumn"));
- Pointer_group_interface (it, "bounded-by-me").add_element (staffline_p_);
- staffline_p_->set_bound(RIGHT,it);
- typeset_element (staffline_p_);
+ staffline_p_->set_bound (RIGHT,it);
+
+ typeset_grob (staffline_p_);
staffline_p_ = 0;
}
void
-Axis_group_engraver::acknowledge_element (Score_element_info i)
+Axis_group_engraver::acknowledge_grob (Grob_info i)
{
elts_.push (i.elem_l_);
}
+/*
+ maybe should check if our parent_l is set, because we now get a
+ cyclic parent relationship if we have two Axis_group_engravers in
+ the context. */
void
-Axis_group_engraver::process_acknowledged ()
+Axis_group_engraver::create_grobs ()
{
/* UGH UGH UGH */
for (int i=0; i < elts_.size (); i++)
{
- Score_element *par = elts_[i]->parent_l (Y_AXIS);
+ Grob *par = elts_[i]->parent_l (Y_AXIS);
if ((!par || !Axis_group_interface::has_interface (par))
&& ! elts_[i]->empty_b (Y_AXIS))
}
void
-Axis_group_engraver::add_element (Score_element*e)
+Axis_group_engraver::add_element (Grob*e)
{
Axis_group_interface::add_element (staffline_p_, e);
}
////////////////////////////////////////////////////////
-
-// maybenot sucsh a good idea after all.
+// maybenot such a good idea after all., to put classes in .cc
#include "hara-kiri-group-spanner.hh"
#include "rhythmic-head.hh"
{
protected:
virtual Spanner*get_spanner_p ()const;
- virtual void acknowledge_element (Score_element_info);
- virtual void add_element (Score_element *e);
+ virtual void acknowledge_grob (Grob_info);
+ virtual void add_element (Grob *e);
public:
- VIRTUAL_COPY_CONS(Translator);
+ VIRTUAL_COPY_CONS (Translator);
};
void
-Hara_kiri_engraver::add_element (Score_element*e)
+Hara_kiri_engraver::add_element (Grob*e)
{
Hara_kiri_group_spanner::add_element (staffline_p_, e);
}
Spanner*
Hara_kiri_engraver::get_spanner_p () const
{
- Spanner * sp = new Spanner (get_property ("basicHaraKiriVerticalGroupspannerProperties"));
+ Spanner * sp = new Spanner (get_property ("HaraKiriVerticalGroup"));
Hara_kiri_group_spanner::set_interface (sp);
return sp;
}
void
-Hara_kiri_engraver::acknowledge_element (Score_element_info i)
+Hara_kiri_engraver::acknowledge_grob (Grob_info i)
{
- Axis_group_engraver::acknowledge_element (i);
- if (Rhythmic_head::has_interface (i.elem_l_))
+ Axis_group_engraver::acknowledge_grob (i);
+ if (Rhythmic_head::has_interface (i.elem_l_)
+ || i.elem_l_->has_interface (ly_symbol2scm ("lyric-syllable-interface")))
{
Hara_kiri_group_spanner::add_interesting_item (staffline_p_, i.elem_l_);
}
}
-ADD_THIS_TRANSLATOR(Hara_kiri_engraver);
+ADD_THIS_TRANSLATOR (Hara_kiri_engraver);
projects / lilypond.git / blobdiff