X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;h=ee20505c4ee453c6b7caaaa5d9b14d24ff4629eb;hb=36f6766b9de37adb09d2a27e3f925b356cbc0849;hp=b9c3ef874141b4e1a6e610189cf61148a9eb316a;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index b9c3ef8741..ee20505c4e 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -3,14 +3,15 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2003 Han-Wen Nienhuys + (c) 1999--2005 Han-Wen Nienhuys */ #include "spanner.hh" #include "paper-column.hh" #include "axis-group-interface.hh" -#include "engraver.hh" #include "engraver-group-engraver.hh" +#include "warn.hh" +#include "context.hh" /** Put stuff in a Spanner with an Axis_group_interface. @@ -21,70 +22,67 @@ class Axis_group_engraver : public Engraver protected: Spanner *staffline_; Link_array elts_; - virtual void initialize (); + virtual void process_music (); 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; } void -Axis_group_engraver::initialize () +Axis_group_engraver::process_music () { - staffline_ = get_spanner (); - - Grob * it = unsmob_grob (get_property ("currentCommandColumn")); - - staffline_->set_bound (LEFT,it); - - announce_grob(staffline_, SCM_EOL); -} + if (!staffline_) + { + staffline_ = get_spanner (); + Grob * it = unsmob_grob (get_property ("currentCommandColumn")); + staffline_->set_bound (LEFT, it); + } +} Spanner* -Axis_group_engraver::get_spanner () const +Axis_group_engraver::get_spanner () { - return new Spanner (get_property ("VerticalAxisGroup")); + return make_spanner ("VerticalAxisGroup", SCM_EOL); } +/* + TODO: should we junk minimumVerticalExtent/extraVerticalExtent ? + */ + void Axis_group_engraver::finalize () { - String type = get_daddy_grav ()->type_string_ ; + if (!staffline_) + return ; + + 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); - staffline_->set_bound (RIGHT,it); - - typeset_grob (staffline_); staffline_ = 0; } @@ -101,14 +99,36 @@ Axis_group_engraver::acknowledge_grob (Grob_info i) void Axis_group_engraver::process_acknowledged_grobs () { - /* UGH UGH UGH */ - for (int i=0; i < elts_.size (); i++) + 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)) - && ! elts_[i]->empty_b (Y_AXIS)) - add_element (elts_[i]); + if (!unsmob_grob (elts_[i]->get_property ("axis-group-parent-Y"))) + { + 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_.clear (); } @@ -119,8 +139,14 @@ Axis_group_engraver::add_element (Grob*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" @@ -128,11 +154,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 @@ -143,10 +169,10 @@ 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 ("HaraKiriVerticalGroup")); - + Spanner * sp = make_spanner ("RemoveEmptyVerticalGroup", SCM_EOL); + return sp; } @@ -154,25 +180,30 @@ void Hara_kiri_engraver::acknowledge_grob (Grob_info i) { Axis_group_engraver::acknowledge_grob (i); - if (Rhythmic_head::has_interface (i.grob_) - || i.grob_->internal_has_interface (ly_symbol2scm ("lyric-syllable-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(){} -ENTER_DESCRIPTION(Hara_kiri_engraver, -/* descr */ "Like Axis_group_engraver, but make a hara kiri spanner, and add " +Hara_kiri_engraver::Hara_kiri_engraver () +{ +} + +ADD_TRANSLATOR (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", +/* creats*/ "RemoveEmptyVerticalGroup", /* accepts */ "", /* acks */ "grob-interface", /* reads */ "", /* write */ ""); -ENTER_DESCRIPTION(Axis_group_engraver, +ADD_TRANSLATOR (Axis_group_engraver, /* descr */ "Group all objects created in this context in a VerticalAxisGroup spanner.", /* creats*/ "VerticalAxisGroup", /* accepts */ "",