X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;h=c28584909f16745e782a86819e1a623b6971ccdd;hb=c730a0aab8ce3fd1785b5815122e061534e53d1c;hp=ac8b637b036b54ed64d9522591a0e15efac40940;hpb=a70685607efdca6d65e073bb041c1312d3a12297;p=lilypond.git diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index ac8b637b03..c28584909f 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--2003 Han-Wen Nienhuys + (c) 1999--2004 Han-Wen Nienhuys */ #include "spanner.hh" @@ -12,6 +12,7 @@ #include "engraver.hh" #include "engraver-group-engraver.hh" #include "warn.hh" +#include "context.hh" /** Put stuff in a Spanner with an Axis_group_interface. @@ -26,16 +27,15 @@ protected: virtual void finalize (); virtual void acknowledge_grob (Grob_info); virtual void process_acknowledged_grobs (); - virtual Spanner* get_spanner () const; + 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 () { + must_be_last_ = true; staffline_ = 0; } @@ -49,15 +49,13 @@ Axis_group_engraver::process_music () Grob * it = unsmob_grob (get_property ("currentCommandColumn")); staffline_->set_bound (LEFT,it); - - announce_grob(staffline_, SCM_EOL); } } Spanner* -Axis_group_engraver::get_spanner () const +Axis_group_engraver::get_spanner () { - return new Spanner (get_property ("VerticalAxisGroup")); + return make_spanner ("VerticalAxisGroup", SCM_EOL); } /* @@ -68,37 +66,26 @@ void Axis_group_engraver::finalize () { if (!staffline_) - { - programming_error ("Huh? This context never lived?"); - return ; - } + return ; - String type = get_daddy_grav ()->context_name (); + String type = context ()->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_->set_extent (Grob::preset_extent_proc, Y_AXIS); - staffline_->set_grob_property ("Y-extent", dims); - } + if (is_number_pair (dims)) + staffline_->set_extent (dims, Y_AXIS); 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); + if (is_number_pair (dims) ) + staffline_->set_property ("minimum-Y-extent", 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); + if (is_number_pair (dims)) + staffline_->set_property ("extra-Y-extent", dims); Grob * it = unsmob_grob (get_property ("currentCommandColumn")); - staffline_->set_bound (RIGHT,it); - typeset_grob (staffline_); staffline_ = 0; } @@ -115,23 +102,38 @@ Axis_group_engraver::acknowledge_grob (Grob_info i) void Axis_group_engraver::process_acknowledged_grobs () { - /* UGH UGH UGH */ + if (!staffline_) + return ; + for (int i=0; i < elts_.size (); i++) { Grob *par = elts_[i]->get_parent (Y_AXIS); if (!par || !Axis_group_interface::has_interface (par)) - if (elts_[i]->empty_b (Y_AXIS)) - { - /* - We have to do _something_, otherwise staff objects will - end up with System as parent. + { + if (staffline_->get_parent (Y_AXIS) + && staffline_->get_parent (Y_AXIS) == elts_[i]) + { + String msg = _("Axis_group_engraver: vertical group already has a parent.\n" + "Do you have two Axis_group_engravers?\n" + "Killing this vertical group."); + staffline_->warning (msg); + staffline_->suicide (); + staffline_ = 0; + break ; + } + else 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_[i]->set_parent (staffline_, Y_AXIS); + } + else + add_element (elts_[i]); + } } elts_.clear (); } @@ -157,11 +159,11 @@ Axis_group_engraver::add_element (Grob*e) class Hara_kiri_engraver : public Axis_group_engraver { protected: - virtual Spanner*get_spanner ()const; + virtual Spanner*get_spanner (); virtual void acknowledge_grob (Grob_info); virtual void add_element (Grob *e); public: - TRANSLATOR_DECLARATIONS(Hara_kiri_engraver); + TRANSLATOR_DECLARATIONS (Hara_kiri_engraver); }; void @@ -172,9 +174,9 @@ Hara_kiri_engraver::add_element (Grob*e) Spanner* -Hara_kiri_engraver::get_spanner () const +Hara_kiri_engraver::get_spanner () { - Spanner * sp = new Spanner (get_property ("RemoveEmptyVerticalGroup")); + Spanner * sp = make_spanner ("RemoveEmptyVerticalGroup", SCM_EOL); return sp; } @@ -183,19 +185,22 @@ void Hara_kiri_engraver::acknowledge_grob (Grob_info i) { Axis_group_engraver::acknowledge_grob (i); - if (i.grob_->internal_has_interface (ly_symbol2scm ("rhythmic-grob-interface"))) + if (staffline_ + && (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_, 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 " +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*/ "RemoveEmptyVerticalGroup", /* accepts */ "", @@ -203,7 +208,7 @@ ENTER_DESCRIPTION(Hara_kiri_engraver, /* reads */ "", /* write */ ""); -ENTER_DESCRIPTION(Axis_group_engraver, +ENTER_DESCRIPTION (Axis_group_engraver, /* descr */ "Group all objects created in this context in a VerticalAxisGroup spanner.", /* creats*/ "VerticalAxisGroup", /* accepts */ "",