X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef-engraver.cc;h=d9b2e27dea3d9cd544d7ccd831c757217028a9bb;hb=f6bd48526091ebf836ce8cbf89b83593b1549736;hp=818e3544a0f93c0c417ceda23a183713a797534c;hpb=0af6d4cb04fa3e4aa69a7aecb76034e4cb1ec49b;p=lilypond.git diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index 818e3544a0..d9b2e27dea 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -3,239 +3,205 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys , + (c) 1997--2007 Han-Wen Nienhuys , Mats Bengtsson */ -#include +#include +using namespace std; -#include "translator-group.hh" -#include "key-item.hh" -#include "local-key-item.hh" -#include "bar.hh" -#include "note-head.hh" +#include "item.hh" +#include "context.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 +#include "translator.icc" + +class Clef_engraver : public Engraver { public: - VIRTUAL_COPY_CONS (Translator); - Clef_engraver (); + TRANSLATOR_DECLARATIONS (Clef_engraver); Direction octave_dir_; protected: - virtual void do_process_music (); - virtual void do_pre_move_processing (); - virtual void do_creation_processing (); - virtual void do_post_move_processing (); - virtual void acknowledge_element (Score_element_info); + void stop_translation_timestep (); + void process_music (); + DECLARE_ACKNOWLEDGER (bar_line); + virtual void derived_mark () const; 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 (); - void set_central_c (SCM, SCM, SCM); void set_glyph (); + void inspect_clef_properties (); }; -Clef_engraver::Clef_engraver () +void +Clef_engraver::derived_mark () const { - clef_p_ = 0; - clef_req_l_ = 0; - octave_dir_ = CENTER; - octavate_p_ = 0; - - /* - will trigger a clef at the start since #f != '() - */ - prev_cpos_ = prev_glyph_ = SCM_BOOL_F; + scm_gc_mark (prev_octavation_); + scm_gc_mark (prev_cpos_); + scm_gc_mark (prev_glyph_); } -void -Clef_engraver::set_central_c (SCM glyph,SCM clefpos, SCM octavation) +Clef_engraver::Clef_engraver () { - prev_cpos_ = clefpos; - prev_glyph_ = glyph; - prev_octavation_ = octavation; - - SCM p = get_property ("clefPitches"); - int c0_position = 0; - if (gh_list_p (p)) - { - SCM found = scm_assoc (glyph, p); - if (found == SCM_BOOL_F) - { - c0_position =0; - } - else - { - c0_position = gh_scm2int (gh_cdr (found)); + clef_ = 0; + octave_dir_ = CENTER; + octavate_ = 0; - if (gh_number_p (octavation)) - c0_position -= gh_scm2int (octavation); - - if (gh_number_p (clefpos)) - c0_position += gh_scm2int (clefpos); - } - - } - daddy_trans_l_->set_property ("centralCPosition", gh_int2scm (c0_position)); + /* + will trigger a clef at the start since #f != ' () + */ + prev_octavation_ = prev_cpos_ = prev_glyph_ = SCM_BOOL_F; } void Clef_engraver::set_glyph () { SCM glyph_sym = ly_symbol2scm ("glyph"); - SCM glyph = get_property ("clefGlyph"); - 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); -} -/** - 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) -{ - Item * item =dynamic_cast (info.elem_l_); - if (item) - { - if (Bar::has_interface (info.elem_l_) - && 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")); - } - } + execute_pushpop_property (context (), basic, glyph_sym, SCM_UNDEFINED); + execute_pushpop_property (context (), basic, glyph_sym, get_property ("clefGlyph")); } +/** + Generate a clef at the start of a measure. (when you see a Bar, + ie. a breakpoint) +*/ void -Clef_engraver::do_creation_processing () +Clef_engraver::acknowledge_bar_line (Grob_info info) { + Item *item = dynamic_cast (info.grob ()); + if (item && scm_is_string (get_property ("clefGlyph"))) + create_clef (); } - - void Clef_engraver::create_clef () { - if (!clef_p_) + if (!clef_) { - Item *c= new Item (get_property ("Clef")); - announce_element (c, 0); + Item *c = make_item ("Clef", 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 (scm_is_number (cpos)) + clef_->set_property ("staff-position", cpos); + + SCM oct = get_property ("clefOctavation"); + if (scm_is_number (oct) && scm_to_int (oct)) + { + Item *g = make_item ("OctavateEight", SCM_EOL); - Side_position::add_support (g,clef_p_); + int abs_oct = scm_to_int (oct); + int dir = sign (abs_oct); + abs_oct = abs (abs_oct) + 1; - g->set_parent (clef_p_, Y_AXIS); - g->set_parent (clef_p_, X_AXIS); + SCM txt = scm_number_to_string (scm_from_int (abs_oct), + scm_from_int (10)); - g->set_elt_property ("direction", gh_int2scm (sign (gh_scm2int (oct)))); - octavate_p_ = g; - announce_element (octavate_p_, 0); + g->set_property ("text", + scm_list_n (ly_lily_module_constant ("vcenter-markup"), + txt, SCM_UNDEFINED)); + Side_position_interface::add_support (g, clef_); + + g->set_parent (clef_, Y_AXIS); + g->set_parent (clef_, X_AXIS); + g->set_property ("direction", scm_from_int (dir)); + octavate_ = g; + } } } +void +Clef_engraver::process_music () +{ + inspect_clef_properties (); +} void -Clef_engraver::do_process_music () +Clef_engraver::inspect_clef_properties () { SCM glyph = get_property ("clefGlyph"); SCM clefpos = get_property ("clefPosition"); SCM octavation = get_property ("clefOctavation"); - - if (scm_equal_p (glyph, prev_glyph_) == SCM_BOOL_F + 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) + || scm_equal_p (octavation, prev_octavation_) == SCM_BOOL_F + || to_boolean (force_clef)) { - set_glyph(); - set_central_c (glyph, clefpos, octavation); - - create_clef (); + set_context_property_on_children (context (), + ly_symbol2scm ("localKeySignature"), + get_property ("keySignature")); + + set_glyph (); + if (prev_cpos_ != SCM_BOOL_F || to_boolean (get_property ("firstClef"))) + create_clef (); - clef_p_->set_elt_property ("non-default", SCM_BOOL_T); + if (clef_) + clef_->set_property ("non-default", SCM_BOOL_T); + + prev_cpos_ = clefpos; + prev_glyph_ = glyph; + prev_octavation_ = octavation; + } + + if (to_boolean (force_clef)) + { + SCM prev; + Context *w = context ()->where_defined (ly_symbol2scm ("forceClef"), &prev); + 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"))) - { - vis = get_property ("explicitClefVisibility"); - } + SCM vis = 0; + if (to_boolean (clef_->get_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_property ("break-visibility", vis); + if (octavate_) + octavate_->set_property ("break-visibility", vis); } - - typeset_element (clef_p_); - clef_p_ =0; - if (octavate_p_) - typeset_element (octavate_p_); + clef_ = 0; - octavate_p_ = 0; + octavate_ = 0; } } -void -Clef_engraver::do_post_move_processing () -{ -} - -ADD_THIS_TRANSLATOR (Clef_engraver); - +ADD_ACKNOWLEDGER (Clef_engraver, bar_line); +ADD_TRANSLATOR (Clef_engraver, + /* doc */ "Determine and set reference point for pitches", + /* create */ "Clef " + "OctavateEight ", + /* read */ + "clefGlyph " + "clefOctavation " + "clefPosition " + "explicitClefVisibility " + "forceClef " + "middleCPosition " + , + /* write */ "");