X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;h=a825805d789ce2ad6d277faadf3b71600d4432c8;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=44b85b416e7ac3fc5e7b9a2463ce92bd4dc246f1;hpb=194ef0e7e19c7a7c0836b6bd3ed2788a56220d2f;p=lilypond.git diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index 44b85b416e..a825805d78 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -3,58 +3,207 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2004 Han-Wen Nienhuys */ -#include "axis-group-engraver.hh" -#include "axis-group-spanner.hh" -#include "p-col.hh" +#include "spanner.hh" +#include "paper-column.hh" +#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. + Use as last element of a context. + */ +class Axis_group_engraver : public Engraver +{ +protected: + Spanner *staffline_; + Link_array elts_; + virtual void process_music (); + 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); +}; Axis_group_engraver::Axis_group_engraver () { - staffline_p_ = 0; + staffline_ = 0; } void -Axis_group_engraver::do_creation_processing () +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); + } +} + +Spanner* +Axis_group_engraver::get_spanner () { - staffline_p_ = get_spanner_p (); - staffline_p_->set_axes (Y_AXIS, Y_AXIS); - staffline_p_->set_bounds(LEFT,get_staff_info().command_pcol_l ()); - announce_element (Score_element_info (staffline_p_, 0)); + return make_spanner ("VerticalAxisGroup"); } -Axis_group_spanner* -Axis_group_engraver::get_spanner_p () const +/* + TODO: should we junk minimumVerticalExtent/extraVerticalExtent ? + */ + +void +Axis_group_engraver::finalize () { - return new Axis_group_spanner; + 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_->set_extent (Grob::preset_extent_proc, Y_AXIS); + staffline_->set_grob_property ("Y-extent", 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 ("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); + + Grob * it = unsmob_grob (get_property ("currentCommandColumn")); + + + staffline_->set_bound (RIGHT,it); + + typeset_grob (staffline_); + staffline_ = 0; } + void -Axis_group_engraver::do_removal_processing () +Axis_group_engraver::acknowledge_grob (Grob_info i) { - staffline_p_->set_bounds(RIGHT,get_staff_info().command_pcol_l ()); - typeset_element (staffline_p_); - staffline_p_ = 0; + elts_.push (i.grob_); } +/* + 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::acknowledge_element (Score_element_info i) +Axis_group_engraver::process_acknowledged_grobs () { - if (!i.elem_l_->parent_l (Y_AXIS)) + /* UGH UGH UGH */ + for (int i=0; i < elts_.size (); i++) { - elts_.push (i.elem_l_); + 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]); } + elts_.clear (); } void -Axis_group_engraver::process_acknowledged () +Axis_group_engraver::add_element (Grob*e) { - for (int i=0; i < elts_.size (); i++) + Axis_group_interface::add_element (staffline_, e); +} + +/****************************************************************/ + +/* + + maybenot such a good idea after all., to put class declarations in + .cc + +*/ + +#include "hara-kiri-group-spanner.hh" +#include "rhythmic-head.hh" + +class Hara_kiri_engraver : public Axis_group_engraver +{ +protected: + virtual Spanner*get_spanner (); + virtual void acknowledge_grob (Grob_info); + virtual void add_element (Grob *e); +public: + TRANSLATOR_DECLARATIONS(Hara_kiri_engraver); +}; + +void +Hara_kiri_engraver::add_element (Grob*e) +{ + Hara_kiri_group_spanner::add_element (staffline_, e); +} + + +Spanner* +Hara_kiri_engraver::get_spanner () +{ + Spanner * sp = make_spanner ("RemoveEmptyVerticalGroup"); + + return sp; +} + +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 (!elts_[i]->parent_l (Y_AXIS)) - staffline_p_->add_element (elts_[i]); + Hara_kiri_group_spanner::add_interesting_item (staffline_, i.grob_); } - elts_.clear (); } -ADD_THIS_TRANSLATOR(Axis_group_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 */ "");