X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef-engraver.cc;h=1891eb4afcad47f714d944e699546d9ced1c5e6c;hb=de658c9789658317b265eb7f3fd34a87c7a8f953;hp=53d9bd62d4cc964e0f4bf8e82c98b2dd24fc99fa;hpb=7776d4901caa57e1d0f3ab7cf01348b930a6dbee;p=lilypond.git diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index 53d9bd62d4..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--2000 Han-Wen Nienhuys , + (c) 1997--2003 Han-Wen Nienhuys , Mats Bengtsson */ @@ -11,107 +11,59 @@ #include #include "translator-group.hh" -#include "key-item.hh" -#include "local-key-item.hh" -#include "bar.hh" -#include "note-head.hh" +#include "bar-line.hh" #include "staff-symbol-referencer.hh" -#include "debug.hh" -#include "command-request.hh" #include "engraver.hh" #include "direction.hh" #include "side-position-interface.hh" #include "item.hh" -#include "custos.hh" -/// where is c-0 in the staff? class Clef_engraver : public Engraver { public: - VIRTUAL_COPY_CONS (Translator); - Clef_engraver (); + TRANSLATOR_DECLARATIONS(Clef_engraver); Direction octave_dir_; - bool first_b_; protected: - virtual void do_process_music (); - virtual void do_pre_move_processing (); - virtual void do_creation_processing (); - virtual void do_post_move_processing (); - virtual bool do_try_music (Music*); - virtual void acknowledge_element (Score_element_info); - + virtual void stop_translation_timestep (); + virtual void start_translation_timestep (); + virtual void process_music (); + virtual void acknowledge_grob (Grob_info); private: - Item * clef_p_; - Item * octavate_p_; - Clef_change_req * clef_req_l_; - + Item * clef_; + Item * octavate_; + + SCM prev_glyph_; + SCM prev_cpos_; + SCM prev_octavation_; void create_clef (); - bool set_type (String); + void set_glyph (); + void inspect_clef_properties (); }; Clef_engraver::Clef_engraver () { - first_b_ = true; - clef_p_ = 0; - clef_req_l_ = 0; + clef_ = 0; octave_dir_ = CENTER; - octavate_p_ = 0; + octavate_ = 0; + + /* + will trigger a clef at the start since #f != ' () + */ + prev_cpos_ = prev_glyph_ = SCM_BOOL_F; } -bool -Clef_engraver::set_type (String s) +void +Clef_engraver::set_glyph () { - if (s.right_str (2) == "_8") // Down one octave - { - octave_dir_ = DOWN; - s = s.left_str (s.length_i () - 2); - } - else if (s.right_str (2) == "^8") // Up one octave - { - octave_dir_ = UP; - s = s.left_str (s.length_i () - 2); - } - else - octave_dir_ = CENTER; - - SCM c = get_property ("supportedClefTypes"); - SCM p = get_property ("clefPitches"); - - if (gh_list_p (c)) - { - SCM found = scm_assoc (ly_str02scm (s.ch_C ()), c); - if (found == SCM_BOOL_F) - return false; - - SCM glyph = gh_cadr (found); - SCM pos = gh_caddr (found); - - daddy_trans_l_->set_property ("clefGlyph", glyph); - daddy_trans_l_->set_property ("clefPosition", pos); - - found = scm_assoc (glyph, p); - if (found == SCM_BOOL_F) - return false; - - int c0_position = gh_scm2int (pos) + gh_scm2int (gh_cdr (found)); - daddy_trans_l_->set_property ("centralCPosition", gh_int2scm (c0_position)); - } - - int c0_position = gh_scm2int (get_property ("centralCPosition")); - c0_position -= (int)octave_dir_ * 7; - daddy_trans_l_->set_property ("centralCPosition", gh_int2scm (c0_position)); - + SCM glyph_sym = ly_symbol2scm ("glyph-name"); + SCM glyph = get_property ("clefGlyph"); SCM basic = ly_symbol2scm ("Clef"); - SCM gl = ly_symbol2scm ("glyph"); - - daddy_trans_l_->execute_single_pushpop_property (basic, gl, SCM_UNDEFINED); - daddy_trans_l_->execute_single_pushpop_property (basic, gl, - get_property ("clefGlyph")); - - return true; + + daddy_trans_->execute_single_pushpop_property (basic, glyph_sym, SCM_UNDEFINED); + daddy_trans_->execute_single_pushpop_property (basic, glyph_sym, glyph); } /** @@ -119,141 +71,131 @@ Clef_engraver::set_type (String s) ie. a breakpoint) */ void -Clef_engraver::acknowledge_element (Score_element_info info) +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 (Note_head::has_interface (item) - || Local_key_item::has_interface (item) - || Custos::has_interface (item) - ) - { - int p = int (Staff_symbol_referencer::position_f (item)) - + gh_scm2int (get_property ("centralCPosition")); - Staff_symbol_referencer::set_position (item, p); - } - else 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_elt_property ("c0-position", get_property ("centralCPosition")); - } } } -void -Clef_engraver::do_creation_processing () -{ - daddy_trans_l_->set_property ("clefPosition", gh_int2scm (0)); - daddy_trans_l_->set_property ("clefGlyph", SCM_EOL); - daddy_trans_l_->set_property ("centralCPosition", gh_int2scm (0)); - - SCM def = get_property ("defaultClef"); - if (gh_string_p (def)) - { - set_type (ly_scm2string (def)); - } -} - -bool -Clef_engraver::do_try_music (Music * r_l) -{ - if (Clef_change_req *cl = dynamic_cast (r_l)) - { - clef_req_l_ = cl; - if (!set_type (cl->clef_str_)) - cl->origin ()->warning (_ ("unknown clef type")); - - return true; - } - return false; -} - void Clef_engraver::create_clef () { - if (!clef_p_) + if (!clef_) { Item *c= new Item (get_property ("Clef")); - announce_element (c, clef_req_l_); + 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") - )); - if (octave_dir_) - { - Item * g = new Item (get_property ("OctavateEight")); + clef_ = c; + SCM cpos = get_property ("clefPosition"); + + 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::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_elt_property ("direction", gh_int2scm (octave_dir_)); - octavate_p_ = g; - announce_element (octavate_p_, clef_req_l_); + 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 (); +} void -Clef_engraver::do_process_music () +Clef_engraver::inspect_clef_properties () { - if (clef_req_l_ || first_b_) + SCM glyph = get_property ("clefGlyph"); + SCM clefpos = get_property ("clefPosition"); + SCM octavation = get_property ("clefOctavation"); + SCM force_clef = get_property ("forceClef"); + + if (clefpos == SCM_EOL + || scm_equal_p (glyph, prev_glyph_) == SCM_BOOL_F + || scm_equal_p (clefpos, prev_cpos_) == SCM_BOOL_F + || scm_equal_p (octavation, prev_octavation_) == SCM_BOOL_F + || to_boolean (force_clef) +) { + set_glyph (); create_clef (); - clef_p_->set_elt_property ("non-default", SCM_BOOL_T); + + 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_->where_defined (ly_symbol2scm ("forceClef")); + w->set_property ("forceClef", SCM_EOL); } } + void -Clef_engraver::do_pre_move_processing () +Clef_engraver::stop_translation_timestep () { - if (clef_p_) + if (clef_) { SCM vis = 0; - if (to_boolean (clef_p_->get_elt_property ("non-default"))) + if (to_boolean (clef_->get_grob_property ("non-default"))) { vis = get_property ("explicitClefVisibility"); } if (vis) { - clef_p_->set_elt_property ("visibility-lambda", vis); - if (octavate_p_) - octavate_p_->set_elt_property ("visibility-lambda", vis); + clef_->set_grob_property ("break-visibility", vis); + if (octavate_) + { + octavate_->set_grob_property ("break-visibility", vis); + + } } - typeset_element (clef_p_); - clef_p_ =0; + typeset_grob (clef_); + clef_ =0; - if (octavate_p_) - typeset_element (octavate_p_); + if (octavate_) + { + Side_position_interface::add_staff_support (octavate_); + typeset_grob (octavate_); + } - octavate_p_ = 0; + octavate_ = 0; } - - first_b_ = 0; } void -Clef_engraver::do_post_move_processing () +Clef_engraver::start_translation_timestep () { - clef_req_l_ = 0; } -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 */ "");