X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef-engraver.cc;h=12fbaaf18faa706ff19744326c6a8220c850eb83;hb=1e66bfb9ec0ebc1b7c09ad9f2256bd77f2230269;hp=b0e1408229b634bb5dd6d774691049160f32bd8d;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index b0e1408229..12fbaaf18f 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -3,108 +3,66 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys , + (c) 1997--2004 Han-Wen Nienhuys , Mats Bengtsson */ #include -#include "translator-group.hh" -#include "key-item.hh" -#include "local-key-item.hh" -#include "bar.hh" -#include "note-head.hh" +#include "context.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" -#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_; protected: - void deprecated_process_music (); virtual void stop_translation_timestep (); - virtual void do_creation_processing (); - virtual void start_translation_timestep (); - virtual void create_grobs (); + virtual void process_music (); virtual void acknowledge_grob (Grob_info); - private: - Item * clef_p_; - Item * octavate_p_; + 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 () { - clef_p_ = 0; + clef_ = 0; octave_dir_ = CENTER; - octavate_p_ = 0; + octavate_ = 0; /* - will trigger a clef at the start since #f != '() + will trigger a clef at the start since #f != ' () */ prev_cpos_ = prev_glyph_ = SCM_BOOL_F; } -void -Clef_engraver::set_central_c (SCM glyph,SCM clefpos, SCM octavation) -{ - 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)); - - 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)); -} - void Clef_engraver::set_glyph () { - SCM glyph_sym = ly_symbol2scm ("glyph"); + SCM glyph_sym = ly_symbol2scm ("glyph-name"); 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); + execute_pushpop_property (daddy_context_, basic, glyph_sym, SCM_UNDEFINED); + execute_pushpop_property (daddy_context_, basic, glyph_sym, glyph); } /** @@ -114,134 +72,131 @@ Clef_engraver::set_glyph () void Clef_engraver::acknowledge_grob (Grob_info info) { - deprecated_process_music (); - 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_grob_property ("c0-position", get_property ("centralCPosition")); - } } } -void -Clef_engraver::do_creation_processing () -{ -} - - - void Clef_engraver::create_clef () { - if (!clef_p_) + if (!clef_) { - Item *c= new Item (get_property ("Clef")); - announce_grob (c, 0); + Item *c= make_item ("Clef"); + 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)); - Side_position::add_support (g,clef_p_); + SCM oct = get_property ("clefOctavation"); + if (gh_number_p (oct) && gh_scm2int (oct)) + { + Item * g = make_item ("OctavateEight"); + + int abs_oct = gh_scm2int (oct) ; + int dir = sign (abs_oct); + abs_oct = abs (abs_oct) + 1; + + SCM txt = scm_number_to_string (gh_int2scm (abs_oct), + SCM_MAKINUM (10)); - g->set_parent (clef_p_, Y_AXIS); - g->set_parent (clef_p_, X_AXIS); + g->set_property ("text", + scm_list_n (ly_scheme_function ("vcenter-markup"), + txt, SCM_UNDEFINED)); + Side_position_interface::add_support (g,clef_); - g->set_grob_property ("direction", gh_int2scm (sign (gh_scm2int (oct)))); - octavate_p_ = g; - announce_grob (octavate_p_, 0); + g->set_parent (clef_, Y_AXIS); + g->set_parent (clef_, X_AXIS); + g->set_property ("direction", scm_int2num (dir)); + octavate_ = g; + announce_grob (octavate_, SCM_EOL); + } } } - void -Clef_engraver::create_grobs () +Clef_engraver::process_music () { - deprecated_process_music (); + inspect_clef_properties (); } void -Clef_engraver::deprecated_process_music () +Clef_engraver::inspect_clef_properties () { 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) + || scm_equal_p (octavation, prev_octavation_) == SCM_BOOL_F + || to_boolean (force_clef)) { - set_glyph(); - set_central_c (glyph, clefpos, octavation); - + set_glyph (); create_clef (); - clef_p_->set_grob_property ("non-default", SCM_BOOL_T); + clef_->set_property ("non-default", SCM_BOOL_T); + + prev_cpos_ = clefpos; + prev_glyph_ = glyph; + prev_octavation_ = octavation; + } + + if (to_boolean (force_clef)) + { + Context * w = daddy_context_->where_defined (ly_symbol2scm ("forceClef")); + w->set_property ("forceClef", SCM_EOL); } } + 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_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_property ("break-visibility", vis); + if (octavate_) + { + octavate_->set_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_) + { + typeset_grob (octavate_); + } - octavate_p_ = 0; + octavate_ = 0; } } -void -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 middleCPosition clefOctavation explicitClefVisibility", +/* write */ "");