X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef-engraver.cc;h=013c5dac4b9a17e6da8230fa86cfb370f82b4bc7;hb=f7c306cacfbdf6229e9414c691e36e49b41ea71a;hp=5de0c8e5495bce25e17f9853bb2e24c14567a73b;hpb=419c0d7734351ed1c89a985867e9127f5af46f90;p=lilypond.git diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index 5de0c8e549..013c5dac4b 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -1,245 +1,246 @@ /* - clef.cc -- implement Clef_engraver + clef-engraver.cc -- implement Clef_engraver source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys , + (c) 1997--2001 Han-Wen Nienhuys , Mats Bengtsson */ -/* - CLEAN ME UP. - */ - #include -#include "staff-symbol-referencer.hh" + +#include "translator-group.hh" +#include "key-item.hh" #include "bar.hh" -#include "clef-engraver.hh" -#include "clef-item.hh" +#include "staff-symbol-referencer.hh" #include "debug.hh" -#include "command-request.hh" -#include "timing-translator.hh" -#include "note-head.hh" -#include "key-item.hh" -#include "local-key-item.hh" +#include "engraver.hh" +#include "direction.hh" +#include "side-position-interface.hh" +#include "item.hh" + -Clef_engraver::Clef_engraver() +class Clef_engraver : public Engraver +{ +public: + VIRTUAL_COPY_CONS (Translator); + Clef_engraver (); + + Direction octave_dir_; + +protected: + virtual void stop_translation_timestep (); + 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_; + + SCM prev_glyph_; + SCM prev_cpos_; + SCM prev_octavation_; + void create_clef (); + void set_central_c (SCM, SCM, SCM); + void set_glyph (); + void inspect_clef_properties (); +}; + +Clef_engraver::Clef_engraver () { clef_p_ = 0; - clef_req_l_ = 0; - clef_type_str_ = ""; - c0_position_i_ = 0; - clef_position_i_ = 0; octave_dir_ = CENTER; - create_default_b_ = true; + octavate_p_ = 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_central_c (SCM glyph,SCM clefpos, SCM octavation) { - 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; + prev_cpos_ = clefpos; + prev_glyph_ = glyph; + prev_octavation_ = octavation; - bool found = false; - SCM c = get_property ("supportedClefTypes",0); - for (; gh_pair_p(c); c = gh_cdr (c)) + SCM p = get_property ("clefPitches"); + int c0_position = 0; + if (gh_list_p (p)) { - SCM entry = gh_car (c); - SCM name = gh_car (entry); + SCM found = scm_assoc (glyph, p); + if (found == SCM_BOOL_F) + { + c0_position =0; + } + else + { + c0_position = gh_scm2int (gh_cdr (found)); - if (ly_scm2string (name) != s) - continue; + if (gh_number_p (octavation)) + c0_position -= gh_scm2int (octavation); - SCM glyph = gh_cadr (entry); - SCM pos = gh_caddr (entry); - - clef_type_str_ = ly_scm2string (glyph); - clef_position_i_ = gh_scm2int (pos); - found = true; - break; - } - - if (!found) - { - switch(toupper (s[0])) - { - case 'F': - clef_type_str_ = "bass"; - break; - case 'G': - clef_type_str_ = "treble"; - break; - case 'C': - clef_type_str_ = "alto"; - break; - default: - return false; + if (gh_number_p (clefpos)) + c0_position += gh_scm2int (clefpos); } - clef_position_i_ = 2 * (s[1] - '0') - 6; + } + daddy_trans_l_->set_property ("centralCPosition", gh_int2scm (c0_position)); +} - if (clef_type_str_ == "treble") - c0_position_i_ = clef_position_i_ - 4; - else if (clef_type_str_ == "alto") - c0_position_i_ = clef_position_i_; - else if (clef_type_str_ == "bass") - c0_position_i_ = clef_position_i_ + 4; - else - assert (false); - - c0_position_i_ -= (int) octave_dir_ * 7; +void +Clef_engraver::set_glyph () +{ + SCM glyph_sym = ly_symbol2scm ("glyph-name"); + SCM glyph = get_property ("clefGlyph"); + + SCM basic = ly_symbol2scm ("Clef"); - return true; + daddy_trans_l_->execute_single_pushpop_property (basic, glyph_sym, SCM_UNDEFINED); + daddy_trans_l_->execute_single_pushpop_property (basic, glyph_sym, glyph); } - /** Generate a clef at the start of a measure. (when you see a Bar, ie. a breakpoint) */ void -Clef_engraver::acknowledge_element (Score_element_info info) +Clef_engraver::acknowledge_grob (Grob_info info) { - if (dynamic_cast(info.elem_l_) - && clef_type_str_.length_i()) + Item * item =dynamic_cast (info.elem_l_); + if (item) { - bool default_clef = !clef_p_; - create_clef(); - if(!default_clef) - clef_p_->set_elt_property("visibility-lambda", - ly_eval_str ("all-visibility")); - } + if (Bar::has_interface (info.elem_l_) + && gh_string_p (get_property ("clefGlyph"))) + create_clef (); - /* ugh; should make Clef_referenced baseclass */ - Item * it_l =dynamic_cast (info.elem_l_); - if (it_l) - { - if (Note_head * h = dynamic_cast(it_l)) - { - Staff_symbol_referencer_interface si (h); - si.set_position (int (si.position_f ()) + c0_position_i_); - } - else if (Local_key_item *i = dynamic_cast (it_l)) - { - i->c0_position_i_ =c0_position_i_; - } - else if (Key_item *k = dynamic_cast(it_l)) + if (Key_item::has_interface (item)) { - k-> set_c_position (c0_position_i_); + /* + 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::do_creation_processing() +Clef_engraver::create_clef () { - create_default_b_ = true; // should read property. - SCM def = get_property ("createInitdefaultClef", 0); - if (gh_string_p (def)) - set_type (ly_scm2string (def)); - - if (clef_type_str_.length_i ()) - { - create_clef(); - clef_p_->set_elt_property ("non-default", SCM_BOOL_T); + if (!clef_p_) + { + Item *c= new Item (get_property ("Clef")); + announce_grob (c, 0); + + Staff_symbol_referencer::set_interface (c); + + clef_p_ = c; } -} + Staff_symbol_referencer::set_position (clef_p_, + gh_scm2int (get_property ("clefPosition"))); -bool -Clef_engraver::do_try_music (Music * r_l) -{ - if (Clef_change_req *cl = dynamic_cast (r_l)) + SCM oct = get_property ("clefOctavation"); + if (gh_number_p (oct) && gh_scm2int (oct)) { - clef_req_l_ = cl; - if (!set_type (cl->clef_str_)) - cl->error (_ ("unknown clef type")); + Item * g = new Item (get_property ("OctavateEight")); - return true; - } - else - return false; + Side_position_interface::add_support (g,clef_p_); + + g->set_parent (clef_p_, Y_AXIS); + g->set_parent (clef_p_, X_AXIS); + g->set_grob_property ("direction", gh_int2scm (sign (gh_scm2int (oct)))); + octavate_p_ = g; + announce_grob (octavate_p_, 0); + } } void -Clef_engraver::create_clef() +Clef_engraver::process_music () { - if (!clef_p_) - { - Clef_item *c= new Clef_item; - c->set_elt_property ("breakable", SCM_BOOL_T); - c->set_elt_property ("break-aligned", SCM_BOOL_T); - announce_element (Score_element_info (c, clef_req_l_)); - - Staff_symbol_referencer_interface si(c); - si.set_interface (); - - clef_p_ = c; - } - Staff_symbol_referencer_interface si(clef_p_); - clef_p_->symbol_ = clef_type_str_; - si.set_position (clef_position_i_); - if (octave_dir_) - { - clef_p_->set_elt_property ("octave-dir", gh_int2scm (octave_dir_)); - } + 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::do_process_requests() +Clef_engraver::inspect_clef_properties () { - if (clef_req_l_) + 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) +) { - create_clef(); + set_glyph (); + set_central_c (glyph, clefpos, octavation); + + create_clef (); + + clef_p_->set_grob_property ("non-default", SCM_BOOL_T); } - else if (create_default_b_) + + if (to_boolean (force_clef)) { - SCM type = get_property ("defaultClef", 0); - if (gh_string_p (type)) - set_type (ly_scm2string (type)); - else - set_type ( "treble"); - create_clef (); - create_default_b_ = false; + Translator_group * w = daddy_trans_l_->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_) { - typeset_element (clef_p_); + SCM vis = 0; + if (to_boolean (clef_p_->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); + } + + typeset_grob (clef_p_); clef_p_ =0; - } - create_default_b_ = false; -} -void -Clef_engraver::do_post_move_processing() -{ - clef_req_l_ = 0; + if (octavate_p_) + typeset_grob (octavate_p_); + + octavate_p_ = 0; + } } void -Clef_engraver::do_removal_processing() +Clef_engraver::start_translation_timestep () { - assert (!clef_p_); } - - -ADD_THIS_TRANSLATOR(Clef_engraver); +ADD_THIS_TRANSLATOR (Clef_engraver);