X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef-engraver.cc;h=1891eb4afcad47f714d944e699546d9ced1c5e6c;hb=de658c9789658317b265eb7f3fd34a87c7a8f953;hp=fb12bd8d9d19ee8ca83fc4508eae527d5c29ecea;hpb=9627516f833fcd89ce59351ae90dc722ec96a2c5;p=lilypond.git diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index fb12bd8d9d..1891eb4afc 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys , + (c) 1997--2003 Han-Wen Nienhuys , Mats Bengtsson */ @@ -11,21 +11,17 @@ #include #include "translator-group.hh" -#include "key-item.hh" -#include "bar.hh" +#include "bar-line.hh" #include "staff-symbol-referencer.hh" -#include "debug.hh" #include "engraver.hh" #include "direction.hh" #include "side-position-interface.hh" #include "item.hh" - class Clef_engraver : public Engraver { public: - VIRTUAL_COPY_CONS (Translator); - Clef_engraver (); + TRANSLATOR_DECLARATIONS(Clef_engraver); Direction octave_dir_; @@ -34,10 +30,9 @@ protected: virtual void start_translation_timestep (); virtual void process_music (); virtual void acknowledge_grob (Grob_info); - virtual void do_creation_processing (); private: - Item * clef_p_; - Item * octavate_p_; + Item * clef_; + Item * octavate_; SCM prev_glyph_; SCM prev_cpos_; @@ -49,9 +44,9 @@ private: Clef_engraver::Clef_engraver () { - clef_p_ = 0; + clef_ = 0; octave_dir_ = CENTER; - octavate_p_ = 0; + octavate_ = 0; /* will trigger a clef at the start since #f != ' () @@ -67,8 +62,8 @@ Clef_engraver::set_glyph () SCM basic = ly_symbol2scm ("Clef"); - daddy_trans_l_->execute_single_pushpop_property (basic, glyph_sym, SCM_UNDEFINED); - daddy_trans_l_->execute_single_pushpop_property (basic, glyph_sym, glyph); + daddy_trans_->execute_single_pushpop_property (basic, glyph_sym, SCM_UNDEFINED); + daddy_trans_->execute_single_pushpop_property (basic, glyph_sym, glyph); } /** @@ -78,75 +73,51 @@ Clef_engraver::set_glyph () void Clef_engraver::acknowledge_grob (Grob_info info) { - Item * item =dynamic_cast (info.elem_l_); + Item * item =dynamic_cast (info.grob_); if (item) { - if (Bar::has_interface (info.elem_l_) + if (Bar_line::has_interface (info.grob_) && gh_string_p (get_property ("clefGlyph"))) create_clef (); - - if (Key_item::has_interface (item)) - { - /* - Key_item adapts its formatting to make sure that the - accidentals stay in the upper half of the staff. It needs - to know c0-pos for this. (?) - */ - - item->set_grob_property ("c0-position", get_property ("centralCPosition")); - } } } void Clef_engraver::create_clef () { - if (!clef_p_) + if (!clef_) { Item *c= new Item (get_property ("Clef")); - announce_grob (c, 0); + announce_grob(c, SCM_EOL); - Staff_symbol_referencer::set_interface (c); - - clef_p_ = c; - } - Staff_symbol_referencer::set_position (clef_p_, - gh_scm2int (get_property ("clefPosition"))); + clef_ = c; + SCM cpos = get_property ("clefPosition"); - SCM oct = get_property ("clefOctavation"); - if (gh_number_p (oct) && gh_scm2int (oct)) - { - Item * g = new Item (get_property ("OctavateEight")); + if (gh_number_p (cpos)) + Staff_symbol_referencer::set_position (clef_, gh_scm2int (cpos)); + + SCM oct = get_property ("clefOctavation"); + if (gh_number_p (oct) && gh_scm2int (oct)) + { + Item * g = new Item (get_property ("OctavateEight")); - Side_position_interface::add_support (g,clef_p_); + Side_position_interface::add_support (g,clef_); - g->set_parent (clef_p_, Y_AXIS); - g->set_parent (clef_p_, X_AXIS); + g->set_parent (clef_, Y_AXIS); + g->set_parent (clef_, X_AXIS); - g->set_grob_property ("direction", gh_int2scm (sign (gh_scm2int (oct)))); - octavate_p_ = g; - announce_grob (octavate_p_, 0); + g->set_grob_property ("direction", scm_int2num (sign (gh_scm2int (oct)))); + octavate_ = g; + announce_grob(octavate_, SCM_EOL); + } } } - void Clef_engraver::process_music () { inspect_clef_properties (); } -/* - this must be done in creation_proc() since grace notes will be - processed before Clef_engraver::prcoess_music() - - Grace notes and clef changes are still broken. -*/ -void -Clef_engraver::do_creation_processing () -{ - inspect_clef_properties (); -} - void Clef_engraver::inspect_clef_properties () { @@ -165,17 +136,16 @@ Clef_engraver::inspect_clef_properties () set_glyph (); create_clef (); - clef_p_->set_grob_property ("non-default", SCM_BOOL_T); - - prev_cpos_ = clefpos; - prev_glyph_ = glyph; - prev_octavation_ = octavation; + clef_->set_grob_property ("non-default", SCM_BOOL_T); + prev_cpos_ = clefpos; + prev_glyph_ = glyph; + prev_octavation_ = octavation; } if (to_boolean (force_clef)) { - Translator_group * w = daddy_trans_l_->where_defined (ly_symbol2scm ("forceClef")); + Translator_group * w = daddy_trans_->where_defined (ly_symbol2scm ("forceClef")); w->set_property ("forceClef", SCM_EOL); } } @@ -184,28 +154,34 @@ Clef_engraver::inspect_clef_properties () void Clef_engraver::stop_translation_timestep () { - if (clef_p_) + if (clef_) { SCM vis = 0; - if (to_boolean (clef_p_->get_grob_property ("non-default"))) + if (to_boolean (clef_->get_grob_property ("non-default"))) { vis = get_property ("explicitClefVisibility"); } if (vis) { - clef_p_->set_grob_property ("visibility-lambda", vis); - if (octavate_p_) - octavate_p_->set_grob_property ("visibility-lambda", vis); + clef_->set_grob_property ("break-visibility", vis); + if (octavate_) + { + octavate_->set_grob_property ("break-visibility", vis); + + } } - typeset_grob (clef_p_); - clef_p_ =0; + typeset_grob (clef_); + clef_ =0; - if (octavate_p_) - typeset_grob (octavate_p_); + if (octavate_) + { + Side_position_interface::add_staff_support (octavate_); + typeset_grob (octavate_); + } - octavate_p_ = 0; + octavate_ = 0; } } @@ -214,5 +190,12 @@ Clef_engraver::start_translation_timestep () { } -ADD_THIS_TRANSLATOR (Clef_engraver); + +ENTER_DESCRIPTION(Clef_engraver, +/* descr */ "Determine and set reference point for pitches", +/* creats*/ "Clef OctavateEight", +/* accepts */ "", +/* acks */ "bar-line-interface", +/* reads */ "clefPosition clefGlyph centralCPosition clefOctavation explicitClefVisibility", +/* write */ "");