X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;h=a825805d789ce2ad6d277faadf3b71600d4432c8;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=e030e09b4bea828be33ce40f1fcc7241d3319db6;hpb=af9078fd6d63dea5141e87a1b4d7cb5b0bcba84a;p=lilypond.git diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index e030e09b4b..a825805d78 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--2001 Han-Wen Nienhuys + (c) 1999--2004 Han-Wen Nienhuys */ #include "spanner.hh" @@ -11,6 +11,7 @@ #include "axis-group-interface.hh" #include "engraver.hh" #include "engraver-group-engraver.hh" +#include "warn.hh" /** Put stuff in a Spanner with an Axis_group_interface. @@ -19,98 +20,113 @@ class Axis_group_engraver : public Engraver { protected: - Spanner *staffline_p_; + Spanner *staffline_; Link_array elts_; - virtual void initialize (); + virtual void process_music (); virtual void finalize (); virtual void acknowledge_grob (Grob_info); - virtual void create_grobs (); - virtual Spanner* get_spanner_p () const; + virtual void process_acknowledged_grobs (); + virtual Spanner* get_spanner () ; virtual void add_element (Grob*) ; public: -TRANSLATOR_DECLARATIONS(Axis_group_engraver ); + TRANSLATOR_DECLARATIONS(Axis_group_engraver); }; - - Axis_group_engraver::Axis_group_engraver () { - staffline_p_ = 0; + staffline_ = 0; } void -Axis_group_engraver::initialize () +Axis_group_engraver::process_music () { - staffline_p_ = get_spanner_p (); - Axis_group_interface::set_interface (staffline_p_); - Axis_group_interface::set_axes (staffline_p_, Y_AXIS, Y_AXIS); + if (!staffline_) + { + staffline_ = get_spanner (); - Grob * it = unsmob_grob (get_property ("currentCommandColumn")); + Grob * it = unsmob_grob (get_property ("currentCommandColumn")); - staffline_p_->set_bound (LEFT,it); + staffline_->set_bound (LEFT,it); - announce_grob (staffline_p_, 0); -} + announce_grob(staffline_, SCM_EOL); + } +} Spanner* -Axis_group_engraver::get_spanner_p () const +Axis_group_engraver::get_spanner () { - return new Spanner (get_property ("VerticalAxisGroup")); + return make_spanner ("VerticalAxisGroup"); } +/* + TODO: should we junk minimumVerticalExtent/extraVerticalExtent ? + */ + void Axis_group_engraver::finalize () { - String type = daddy_grav_l ()->type_str_ ; - SCM dims = get_property ("VerticalExtent"); + if (!staffline_) + return ; + + String type = get_daddy_grav ()->context_name (); + SCM dims = get_property ("verticalExtent"); if (gh_pair_p (dims) && gh_number_p (ly_car (dims)) && gh_number_p (ly_cdr (dims))) { - staffline_p_->set_extent_callback (Grob::preset_extent_proc, Y_AXIS); - staffline_p_->set_grob_property ("extent-Y", dims); + staffline_->set_extent (Grob::preset_extent_proc, Y_AXIS); + staffline_->set_grob_property ("Y-extent", dims); } - dims = get_property ("MinimumVerticalExtent"); + dims = get_property ("minimumVerticalExtent"); if (gh_pair_p (dims) && gh_number_p (ly_car (dims)) && gh_number_p (ly_cdr (dims))) - staffline_p_->set_grob_property ("minimum-extent-Y", dims); + staffline_->set_grob_property ("minimum-Y-extent", dims); - dims = get_property ("ExtraVerticalExtent"); + dims = get_property ("extraVerticalExtent"); if (gh_pair_p (dims) && gh_number_p (ly_car (dims)) && gh_number_p (ly_cdr (dims))) - staffline_p_->set_grob_property ("extra-extent-Y", dims); + staffline_->set_grob_property ("extra-Y-extent", dims); Grob * it = unsmob_grob (get_property ("currentCommandColumn")); - staffline_p_->set_bound (RIGHT,it); + staffline_->set_bound (RIGHT,it); - typeset_grob (staffline_p_); - staffline_p_ = 0; + typeset_grob (staffline_); + staffline_ = 0; } void Axis_group_engraver::acknowledge_grob (Grob_info i) { - elts_.push (i.grob_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::create_grobs () +Axis_group_engraver::process_acknowledged_grobs () { /* UGH UGH UGH */ for (int i=0; i < elts_.size (); i++) { Grob *par = elts_[i]->get_parent (Y_AXIS); - if ((!par || !Axis_group_interface::has_interface (par)) - && ! elts_[i]->empty_b (Y_AXIS)) - add_element (elts_[i]); + if (!par || !Axis_group_interface::has_interface (par)) + if (elts_[i]->is_empty (Y_AXIS)) + { + /* + We have to do _something_, otherwise staff objects will + end up with System as parent. + + */ + elts_[i]->set_parent (staffline_, Y_AXIS); + } + else + add_element (elts_[i]); } elts_.clear (); } @@ -118,11 +134,17 @@ Axis_group_engraver::create_grobs () void Axis_group_engraver::add_element (Grob*e) { - Axis_group_interface::add_element (staffline_p_, e); + Axis_group_interface::add_element (staffline_, e); } -//////////////////////////////////////////////////////// -// maybenot such a good idea after all., to put classes in .cc +/****************************************************************/ + +/* + + maybenot such a good idea after all., to put class declarations in + .cc + +*/ #include "hara-kiri-group-spanner.hh" #include "rhythmic-head.hh" @@ -130,7 +152,7 @@ Axis_group_engraver::add_element (Grob*e) class Hara_kiri_engraver : public Axis_group_engraver { protected: - virtual Spanner*get_spanner_p ()const; + virtual Spanner*get_spanner (); virtual void acknowledge_grob (Grob_info); virtual void add_element (Grob *e); public: @@ -140,15 +162,15 @@ public: void 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 () { - Spanner * sp = new Spanner (get_property ("HaraKiriVerticalGroup")); - Hara_kiri_group_spanner::set_interface (sp); + Spanner * sp = make_spanner ("RemoveEmptyVerticalGroup"); + return sp; } @@ -156,27 +178,32 @@ void Hara_kiri_engraver::acknowledge_grob (Grob_info i) { Axis_group_engraver::acknowledge_grob (i); - if (Rhythmic_head::has_interface (i.grob_l_) - || i.grob_l_->has_interface (ly_symbol2scm ("lyric-syllable-interface"))) + if (i.grob_->internal_has_interface (ly_symbol2scm ("rhythmic-grob-interface")) + || i.grob_->internal_has_interface (ly_symbol2scm ("lyric-interface")) + ) { - Hara_kiri_group_spanner::add_interesting_item (staffline_p_, i.grob_l_); + Hara_kiri_group_spanner::add_interesting_item (staffline_, i.grob_); } } -Hara_kiri_engraver::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", +/* descr */ "Like Axis_group_engraver, but make a hara kiri spanner, and add " +"interesting items (ie. note heads, lyric syllables and normal rests) ", +/* creats*/ "RemoveEmptyVerticalGroup", +/* accepts */ "", +/* 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", +/* accepts */ "", +/* acks */ "grob-interface", +/* reads */ "verticalExtent minimumVerticalExtent extraVerticalExtent", /* write */ "");