X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;h=bdaa7e93f8b070d0affb98173f0d3078bedfe484;hb=d765f3af45be51f15da55cf570a4b172200e1035;hp=ef031b322953df93a43bfbf426f72c3efe04d5db;hpb=b0fc2bbf6d5f9b64c8bba3b7b5e4e50297c36e00;p=lilypond.git diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index ef031b3229..bdaa7e93f8 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ #include "spanner.hh" @@ -19,95 +19,92 @@ class Axis_group_engraver : public Engraver { protected: - Spanner *staffline_p_; - Link_array elts_; - virtual void do_creation_processing(); - virtual void do_removal_processing(); - virtual void acknowledge_element (Score_element_info); - virtual void process_acknowledged (); - virtual Spanner* get_spanner_p () const; - virtual void add_element (Score_element*) ; + Spanner *staffline_; + Link_array elts_; + virtual void initialize (); + virtual void finalize (); + virtual void acknowledge_grob (Grob_info); + virtual void process_acknowledged_grobs (); + virtual Spanner* get_spanner () const; + virtual void add_element (Grob*) ; public: - VIRTUAL_COPY_CONS(Translator); - Axis_group_engraver (); +TRANSLATOR_DECLARATIONS(Axis_group_engraver ); }; -ADD_THIS_TRANSLATOR(Axis_group_engraver); + Axis_group_engraver::Axis_group_engraver () { - staffline_p_ = 0; + staffline_ = 0; } 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); + staffline_ = get_spanner (); - Score_element * it = unsmob_element (get_property ("currentCommandColumn")); + Grob * it = unsmob_grob (get_property ("currentCommandColumn")); - staffline_p_->set_bound(LEFT,it); + staffline_->set_bound (LEFT,it); - announce_element (staffline_p_, 0); + announce_grob(staffline_, SCM_EOL); } Spanner* -Axis_group_engraver::get_spanner_p () const +Axis_group_engraver::get_spanner () 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()); + String type = get_daddy_grav ()->type_string_ ; + SCM dims = get_property ("verticalExtent"); - if (gh_pair_p (dims) && gh_number_p (gh_car (dims)) - && gh_number_p (gh_cdr (dims))) + if (gh_pair_p (dims) && gh_number_p (ly_car (dims)) + && gh_number_p (ly_cdr (dims))) { - staffline_p_->set_extent_callback (&Score_element::preset_extent, Y_AXIS); - staffline_p_->set_elt_property ("extent-Y", dims); + staffline_->set_extent (Grob::preset_extent_proc, Y_AXIS); + staffline_->set_grob_property ("Y-extent", dims); } - dims = get_property ((type + "MinimumVerticalExtent").ch_C()); - 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); + dims = get_property ("minimumVerticalExtent"); + if (gh_pair_p (dims) && gh_number_p (ly_car (dims)) + && gh_number_p (ly_cdr (dims))) + staffline_->set_grob_property ("minimum-Y-extent", dims); - dims = get_property ((type + "ExtraVerticalExtent").ch_C()); - 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); + dims = get_property ("extraVerticalExtent"); + if (gh_pair_p (dims) && gh_number_p (ly_car (dims)) + && gh_number_p (ly_cdr (dims))) + staffline_->set_grob_property ("extra-Y-extent", dims); - Score_element * it = unsmob_element (get_property ("currentCommandColumn")); + Grob * it = unsmob_grob (get_property ("currentCommandColumn")); - staffline_p_->set_bound(RIGHT,it); + staffline_->set_bound (RIGHT,it); - typeset_element (staffline_p_); - staffline_p_ = 0; + typeset_grob (staffline_); + staffline_ = 0; } void -Axis_group_engraver::acknowledge_element (Score_element_info i) +Axis_group_engraver::acknowledge_grob (Grob_info i) { - elts_.push (i.elem_l_); + elts_.push (i.grob_); } /* - maybe should check if our parent_l is set, because we now get a + maybe should check if our parent 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::process_acknowledged_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]->get_parent (Y_AXIS); if ((!par || !Axis_group_interface::has_interface (par)) && ! elts_[i]->empty_b (Y_AXIS)) @@ -117,9 +114,9 @@ Axis_group_engraver::process_acknowledged () } void -Axis_group_engraver::add_element (Score_element*e) +Axis_group_engraver::add_element (Grob*e) { - Axis_group_interface::add_element (staffline_p_, e); + Axis_group_interface::add_element (staffline_, e); } //////////////////////////////////////////////////////// @@ -131,35 +128,53 @@ Axis_group_engraver::add_element (Score_element*e) class Hara_kiri_engraver : public Axis_group_engraver { protected: - virtual Spanner*get_spanner_p ()const; - virtual void acknowledge_element (Score_element_info); - virtual void add_element (Score_element *e); + virtual Spanner*get_spanner ()const; + virtual void acknowledge_grob (Grob_info); + virtual void add_element (Grob *e); public: - VIRTUAL_COPY_CONS(Translator); + TRANSLATOR_DECLARATIONS(Hara_kiri_engraver); }; 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); + Hara_kiri_group_spanner::add_element (staffline_, e); } Spanner* -Hara_kiri_engraver::get_spanner_p () const +Hara_kiri_engraver::get_spanner () const { - Spanner * sp = new Spanner (get_property ("basicHaraKiriVerticalGroupspannerProperties")); - Hara_kiri_group_spanner::set_interface (sp); + Spanner * sp = new Spanner (get_property ("HaraKiriVerticalGroup")); + 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.grob_) + || i.grob_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))) { - Hara_kiri_group_spanner::add_interesting_item (staffline_p_, i.elem_l_); + Hara_kiri_group_spanner::add_interesting_item (staffline_, i.grob_); } } -ADD_THIS_TRANSLATOR(Hara_kiri_engraver); + +Hara_kiri_engraver::Hara_kiri_engraver(){} + +ENTER_DESCRIPTION(Hara_kiri_engraver, +/* descr */ "Like Axis_group_engraver, but make a hara kiri spanner, and add +interesting items (ie. note heads, lyric syllables and normal rests) +", +/* creats*/ "HaraKiriVerticalGroup", +/* acks */ "grob-interface", +/* reads */ "", +/* write */ ""); + +ENTER_DESCRIPTION(Axis_group_engraver, +/* descr */ "Group all objects created in this context in a VerticalAxisGroup spanner.", +/* creats*/ "VerticalAxisGroup", +/* acks */ "grob-interface", +/* reads */ "verticalExtent minimumVerticalExtent extraVerticalExtent", +/* write */ "");