X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef-engraver.cc;h=041e3410f5c1ad04014148fe3d2cc992d496648e;hb=160441415ece6ea402f7af59087293d8d16c29f2;hp=3d33c6cc7e99aede4e8adaac77b830dc7330ce4d;hpb=7ed4019033adf7db7a8f64c4eb7b7f6d0449402f;p=lilypond.git diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index 3d33c6cc7e..041e3410f5 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -1,19 +1,16 @@ /* - 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--2000 Han-Wen Nienhuys , Mats Bengtsson */ -/* - CLEAN ME UP. - */ #include +#include "staff-symbol-referencer.hh" #include "bar.hh" -#include "clef-engraver.hh" #include "clef-item.hh" #include "debug.hh" #include "command-request.hh" @@ -21,16 +18,43 @@ #include "note-head.hh" #include "key-item.hh" #include "local-key-item.hh" +#include "array.hh" +#include "engraver.hh" +#include "direction.hh" + +/// where is c-0 in the staff? +class Clef_engraver : public Engraver { + Clef_item * clef_p_; + Clef_change_req * clef_req_l_; + void create_clef(); + bool set_type (String); +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); +public: + VIRTUAL_COPY_CONS(Translator); + int c0_position_i_; + int clef_position_i_; + // junkme. + Direction octave_dir_; + SCM clef_glyph_; // no need for protection. Always referenced somewhere else. + + Clef_engraver(); +}; + Clef_engraver::Clef_engraver() { + clef_glyph_ = SCM_EOL; 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; } bool @@ -49,55 +73,28 @@ Clef_engraver::set_type (String s) else octave_dir_ = CENTER; - bool found = false; - SCM c = get_property ("supportedClefTypes",0); - for (; gh_pair_p(c); c = gh_cdr (c)) + SCM c = get_property ("supportedClefTypes"); + SCM p = get_property ("clefPitches"); + + if (gh_list_p (c)) { - SCM entry = gh_car (c); - SCM name = gh_car (entry); - - if (ly_scm2string (name) != s) - continue; - - SCM glyph = gh_cadr (entry); - SCM pos = gh_caddr (entry); + SCM found = scm_assoc (ly_str02scm (s.ch_C()), c); + if (found == SCM_BOOL_F) + return false; - clef_type_str_ = ly_scm2string (glyph); + clef_glyph_ = gh_cadr (found); + SCM pos = gh_caddr (found); + 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; - } - clef_position_i_ = 2 * (s[1] - '0') - 6; + + found = scm_assoc (clef_glyph_, p); + if (found == SCM_BOOL_F) + return false; + + c0_position_i_ = clef_position_i_ + gh_scm2int (gh_cdr (found)); } - 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; - return true; } @@ -110,30 +107,24 @@ void Clef_engraver::acknowledge_element (Score_element_info info) { if (dynamic_cast(info.elem_l_) - && clef_type_str_.length_i()) - { - bool default_clef = !clef_p_; - create_clef(); - if(!default_clef) - clef_p_->set_elt_property("visibility-lambda", - ly_ch_C_eval_scm ("all-visibility")); - } + && gh_string_p (clef_glyph_)) + 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)) + if (dynamic_cast(it_l) + || dynamic_cast (it_l) + ) + { - h->set_position (int (h->position_f ()) + c0_position_i_); - } - else if (Local_key_item *i = dynamic_cast (it_l)) - { - i->c0_position_i_ =c0_position_i_; + Staff_symbol_referencer_interface si (it_l); + si.set_position (int (si.position_f ()) + c0_position_i_); } else if (Key_item *k = dynamic_cast(it_l)) { - k-> set_c_position (c0_position_i_); + k->set_elt_property ("c0-position", gh_int2scm (c0_position_i_)); } } } @@ -141,14 +132,11 @@ Clef_engraver::acknowledge_element (Score_element_info info) void Clef_engraver::do_creation_processing() { - create_default_b_ = true; // should read property. - SCM def = get_property ("createInitdefaultClef", 0); + SCM def = get_property ("defaultClef"); if (gh_string_p (def)) - set_type (ly_scm2string (def)); - - if (clef_type_str_.length_i ()) - { - create_clef(); + { + set_type (ly_scm2string (def)); + create_clef (); clef_p_->set_elt_property ("non-default", SCM_BOOL_T); } } @@ -175,13 +163,18 @@ Clef_engraver::create_clef() 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; } - - clef_p_->symbol_ = clef_type_str_; - clef_p_->set_position(clef_position_i_); + Staff_symbol_referencer_interface si(clef_p_); + clef_p_->set_elt_property ("glyph", clef_glyph_); + si.set_position (clef_position_i_); if (octave_dir_) { clef_p_->set_elt_property ("octave-dir", gh_int2scm (octave_dir_)); @@ -190,21 +183,12 @@ Clef_engraver::create_clef() void -Clef_engraver::do_process_requests() +Clef_engraver::do_process_music() { if (clef_req_l_) { create_clef(); - } - else if (create_default_b_) - { - 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; + clef_p_->set_elt_property ("non-default", SCM_BOOL_T); } } @@ -213,10 +197,13 @@ Clef_engraver::do_pre_move_processing() { if (clef_p_) { + if(to_boolean (clef_p_->remove_elt_property("non-default"))) + clef_p_->set_elt_property("visibility-lambda", + scm_eval (ly_symbol2scm ("all-visible"))); + typeset_element (clef_p_); clef_p_ =0; } - create_default_b_ = false; } void @@ -225,11 +212,6 @@ Clef_engraver::do_post_move_processing() clef_req_l_ = 0; } -void -Clef_engraver::do_removal_processing() -{ - assert (!clef_p_); -}