X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;h=946914e6555de1d38efbde77fcbff1fe263d835d;hb=9bea477a992947adbbba48bc479c3f551cde8225;hp=ee07b86f456bdbeb236083e5903e516da77917a4;hpb=b1323f33e9aa4b9eea05eefb8755c907d4d762d4;p=lilypond.git diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index ee07b86f45..946914e655 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -1,23 +1,22 @@ -/* - axis-group-engraver.cc -- implement Axis_group_engraver - +/* + axis-group-engraver.cc -- implement Axis_group_engraver + source file of the GNU LilyPond music typesetter - - (c) 1999--2004 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. - Use as last element of a context. - */ + Use as last element of a context. +*/ class Axis_group_engraver : public Engraver { protected: @@ -27,14 +26,15 @@ protected: virtual void finalize (); virtual void acknowledge_grob (Grob_info); virtual void process_acknowledged_grobs (); - virtual Spanner* get_spanner () ; - virtual void add_element (Grob*) ; -public: - TRANSLATOR_DECLARATIONS(Axis_group_engraver); + virtual Spanner *get_spanner (); + virtual void add_element (Grob *); +public: + TRANSLATOR_DECLARATIONS (Axis_group_engraver); }; Axis_group_engraver::Axis_group_engraver () { + must_be_last_ = true; staffline_ = 0; } @@ -44,50 +44,45 @@ Axis_group_engraver::process_music () if (!staffline_) { staffline_ = get_spanner (); - - Grob * it = unsmob_grob (get_property ("currentCommandColumn")); - - staffline_->set_bound (LEFT,it); - - announce_grob(staffline_, SCM_EOL); + Grob *it = unsmob_grob (get_property ("currentCommandColumn")); + staffline_->set_bound (LEFT, it); } -} +} -Spanner* -Axis_group_engraver::get_spanner () +Spanner * +Axis_group_engraver::get_spanner () { - return make_spanner ("VerticalAxisGroup"); + return make_spanner ("VerticalAxisGroup", SCM_EOL); } /* - TODO: should we junk minimumVerticalExtent/extraVerticalExtent ? - */ + TODO: should we junk minimumVerticalExtent/extraVerticalExtent ? +*/ void Axis_group_engraver::finalize () { if (!staffline_) - return ; - - String type = daddy_context_->context_name (); + return; + + String type = context ()->context_name (); SCM dims = get_property ("verticalExtent"); - + if (is_number_pair (dims)) staffline_->set_extent (dims, Y_AXIS); dims = get_property ("minimumVerticalExtent"); - if (is_number_pair (dims) ) + if (is_number_pair (dims)) staffline_->set_property ("minimum-Y-extent", dims); dims = get_property ("extraVerticalExtent"); if (is_number_pair (dims)) staffline_->set_property ("extra-Y-extent", dims); - Grob * it = unsmob_grob (get_property ("currentCommandColumn")); + Grob *it = unsmob_grob (get_property ("currentCommandColumn")); - staffline_->set_bound (RIGHT,it); + staffline_->set_bound (RIGHT, it); - typeset_grob (staffline_); staffline_ = 0; } @@ -104,29 +99,42 @@ 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)) - 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]); + 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 (); } void -Axis_group_engraver::add_element (Grob*e) +Axis_group_engraver::add_element (Grob *e) { Axis_group_interface::add_element (staffline_, e); } @@ -134,10 +142,8 @@ Axis_group_engraver::add_element (Grob*e) /****************************************************************/ /* - - maybenot such a good idea after all., to put class declarations in - .cc - + maybenot such a good idea after all., to put class declarations in + .cc */ #include "hara-kiri-group-spanner.hh" @@ -146,25 +152,24 @@ Axis_group_engraver::add_element (Grob*e) class Hara_kiri_engraver : public Axis_group_engraver { protected: - virtual Spanner*get_spanner (); + 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 -Hara_kiri_engraver::add_element (Grob*e) +Hara_kiri_engraver::add_element (Grob *e) { Hara_kiri_group_spanner::add_element (staffline_, e); } - -Spanner* -Hara_kiri_engraver::get_spanner () +Spanner * +Hara_kiri_engraver::get_spanner () { - Spanner * sp = make_spanner ("RemoveEmptyVerticalGroup"); - + Spanner *sp = make_spanner ("RemoveEmptyVerticalGroup", SCM_EOL); + return sp; } @@ -172,32 +177,31 @@ 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")) - || i.grob_->internal_has_interface (ly_symbol2scm ("lyric-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 " -"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", -/* accepts */ "", -/* acks */ "grob-interface", -/* reads */ "verticalExtent minimumVerticalExtent extraVerticalExtent", -/* write */ ""); +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*/ "RemoveEmptyVerticalGroup", + /* accepts */ "", + /* acks */ "grob-interface", + /* reads */ "", + /* write */ ""); + +ADD_TRANSLATOR (Axis_group_engraver, + /* descr */ "Group all objects created in this context in a VerticalAxisGroup spanner.", + /* creats*/ "VerticalAxisGroup", + /* accepts */ "", + /* acks */ "grob-interface", + /* reads */ "verticalExtent minimumVerticalExtent extraVerticalExtent", + /* write */ "");