From: Han-Wen Nienhuys Date: Thu, 19 May 2005 22:24:08 +0000 (+0000) Subject: (acknowledge_grob): split X-Git-Tag: release/2.5.25~6 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cf226d3dcf74938e004cfa89d85917cbdd7e3e36;p=lilypond.git (acknowledge_grob): split Hara_kiri_engraver in separate file. --- diff --git a/ChangeLog b/ChangeLog index 3b114cb8dd..b50334e23a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-05-20 Han-Wen Nienhuys + * lily/hara-kiri-engraver.cc (acknowledge_grob): split + Hara_kiri_engraver in separate file. + * lily/slur-configuration.cc (score_encompass): oops, */ +#include "axis-group-engraver.hh" + #include "spanner.hh" #include "paper-column.hh" #include "axis-group-interface.hh" @@ -13,25 +15,6 @@ #include "warn.hh" #include "context.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 () { must_be_last_ = true; @@ -138,79 +121,6 @@ Axis_group_engraver::add_element (Grob *e) 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); - virtual void start_translation_timestep (); - - SCM interesting_; -public: - TRANSLATOR_DECLARATIONS (Hara_kiri_engraver); -}; - -void -Hara_kiri_engraver::start_translation_timestep () -{ - Axis_group_engraver::start_translation_timestep (); - interesting_ = get_property ("keepAliveInterfaces"); -} - - -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", SCM_EOL); - - return sp; -} - -void -Hara_kiri_engraver::acknowledge_grob (Grob_info i) -{ - Axis_group_engraver::acknowledge_grob (i); - if (staffline_) - { - for (SCM s = interesting_; scm_is_pair (s); s = scm_cdr (s)) - { - if (i.grob ()->internal_has_interface (scm_car (s))) - Hara_kiri_group_spanner::add_interesting_item (staffline_, i.grob ()); - } - } -} - -Hara_kiri_engraver::Hara_kiri_engraver () -{ - interesting_ = SCM_EOL; -} - -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 */ "keepAliveInterfaces", - /* write */ ""); - ADD_TRANSLATOR (Axis_group_engraver, /* descr */ "Group all objects created in this context in a VerticalAxisGroup spanner.", /* creats*/ "VerticalAxisGroup", diff --git a/lily/hara-kiri-engraver.cc b/lily/hara-kiri-engraver.cc new file mode 100644 index 0000000000..5380c92a69 --- /dev/null +++ b/lily/hara-kiri-engraver.cc @@ -0,0 +1,76 @@ +/* + hara-kiri-engraver.cc -- implement Hara_kiri_engraver + + source file of the GNU LilyPond music typesetter + + (c) 2005 Han-Wen Nienhuys + +*/ + +#include "axis-group-engraver.hh" +#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); + virtual void start_translation_timestep (); + + SCM interesting_; +public: + TRANSLATOR_DECLARATIONS (Hara_kiri_engraver); +}; + +void +Hara_kiri_engraver::start_translation_timestep () +{ + Axis_group_engraver::start_translation_timestep (); + interesting_ = get_property ("keepAliveInterfaces"); +} + + +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", SCM_EOL); + + return sp; +} + +void +Hara_kiri_engraver::acknowledge_grob (Grob_info i) +{ + Axis_group_engraver::acknowledge_grob (i); + if (staffline_) + { + for (SCM s = interesting_; scm_is_pair (s); s = scm_cdr (s)) + { + if (i.grob ()->internal_has_interface (scm_car (s))) + Hara_kiri_group_spanner::add_interesting_item (staffline_, i.grob ()); + } + } +} + +Hara_kiri_engraver::Hara_kiri_engraver () +{ + interesting_ = SCM_EOL; +} + +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 */ "keepAliveInterfaces", + /* write */ ""); + diff --git a/lily/include/axis-group-engraver.hh b/lily/include/axis-group-engraver.hh new file mode 100644 index 0000000000..b7dbd62719 --- /dev/null +++ b/lily/include/axis-group-engraver.hh @@ -0,0 +1,33 @@ +/* + axis-group-engraver.hh -- declare Axis_group_engraver + + source file of the GNU LilyPond music typesetter + + (c) 2005 Han-Wen Nienhuys + +*/ + +#ifndef AXIS_GROUP_ENGRAVER_HH +#define AXIS_GROUP_ENGRAVER_HH + +#include "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 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); +}; +#endif /* AXIS_GROUP_ENGRAVER_HH */