X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;h=2fb6b0c17b715abc0836eec38f2c3fb69a28efd0;hb=e62c1e205cd619afcc43fd8c8a9a2c5a093b508e;hp=286d42477b85b79fca6c760df20641a28302a5f6;hpb=132f4f00e4da58543891fbb07bcd6a9627eaef09;p=lilypond.git diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index 286d42477b..2fb6b0c17b 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -1,97 +1,72 @@ -/* - axis-group-engraver.cc -- implement Axis_group_engraver - - source file of the GNU LilyPond music typesetter - - (c) 1999--2003 Han-Wen Nienhuys - */ +/* + This file is part of LilyPond, the GNU music typesetter. -#include "spanner.hh" -#include "paper-column.hh" -#include "axis-group-interface.hh" -#include "engraver.hh" -#include "engraver-group-engraver.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 initialize (); - virtual void finalize (); - virtual void acknowledge_grob (Grob_info); - virtual void process_acknowledged_grobs (); - virtual Spanner* get_spanner () const; - virtual void add_element (Grob*) ; -public: -TRANSLATOR_DECLARATIONS(Axis_group_engraver ); -}; + Copyright (C) 1999--2009 Han-Wen Nienhuys + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ + +#include "axis-group-engraver.hh" + +#include "axis-group-interface.hh" +#include "pointer-group-interface.hh" +#include "context.hh" +#include "international.hh" +#include "spanner.hh" +#include "warn.hh" +#include "translator.icc" 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 +Spanner * +Axis_group_engraver::get_spanner () { - return new Spanner (get_property ("VerticalAxisGroup")); + return make_spanner ("VerticalAxisGroup", SCM_EOL); } void Axis_group_engraver::finalize () { - String type = get_daddy_grav ()->type_string_ ; - SCM dims = get_property ("verticalExtent"); - - if (gh_pair_p (dims) && gh_number_p (ly_car (dims)) - && gh_number_p (ly_cdr (dims))) + if (staffline_) { - 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")); - + Grob *it = unsmob_grob (get_property ("currentCommandColumn")); + staffline_->set_bound (RIGHT, it); - staffline_->set_bound (RIGHT,it); - - typeset_grob (staffline_); - staffline_ = 0; + Pointer_group_interface::set_ordered (staffline_, ly_symbol2scm ("elements"), false); + } } void Axis_group_engraver::acknowledge_grob (Grob_info i) { - elts_.push (i.grob_); + elts_.push_back (i.grob ()); } /* @@ -99,84 +74,50 @@ Axis_group_engraver::acknowledge_grob (Grob_info i) cyclic parent relationship if we have two Axis_group_engravers in the context. */ void -Axis_group_engraver::process_acknowledged_grobs () +Axis_group_engraver::process_acknowledged () { - /* UGH UGH UGH */ - for (int i=0; i < elts_.size (); i++) - { - Grob *par = elts_[i]->get_parent (Y_AXIS); + if (!staffline_) + return; - if ((!par || !Axis_group_interface::has_interface (par)) - && ! elts_[i]->empty_b (Y_AXIS)) - add_element (elts_[i]); + for (vsize i = 0; i < elts_.size (); i++) + { + if (!unsmob_grob (elts_[i]->get_object ("axis-group-parent-Y"))) + { + if (staffline_->get_parent (Y_AXIS) + && staffline_->get_parent (Y_AXIS) == elts_[i]) + { + staffline_->warning (_ ("Axis_group_engraver: vertical group already has a parent")); + staffline_->warning (_ ("are there two Axis_group_engravers?")); + staffline_->warning (_ ("removing this vertical group")); + staffline_->suicide (); + staffline_ = 0; + break; + } + 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); } -//////////////////////////////////////////////////////// -// maybenot such a good idea after all., to put classes 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 ()const; - 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); -} - +ADD_ACKNOWLEDGER (Axis_group_engraver, grob); -Spanner* -Hara_kiri_engraver::get_spanner () const -{ - Spanner * sp = new Spanner (get_property ("HaraKiriVerticalGroup")); +ADD_TRANSLATOR (Axis_group_engraver, + /* doc */ + "Group all objects created in this context in a" + " @code{VerticalAxisGroup} spanner.", - return sp; -} + /* create */ + "VerticalAxisGroup ", -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")) - ) - { - Hara_kiri_group_spanner::add_interesting_item (staffline_, i.grob_); - } -} + /* read */ + "currentCommandColumn ", -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", -/* 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 */ ""); + /* write */ + "" + );