X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef-engraver.cc;h=152d95163e1f0ba6c7c08b149752f95370662309;hb=48f2b9351f93d0161c675cfb60e95bf919041df2;hp=da300420b16aaf5bec51984711142df57f764449;hpb=f1baf9749eb3315b6f58622e084fc34295bccea7;p=lilypond.git diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index da300420b1..152d95163e 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -1,5 +1,5 @@ /* - clef.cc -- implement Clef_engraver + clef-engraver.cc -- implement Clef_engraver source file of the GNU LilyPond music typesetter @@ -9,51 +9,54 @@ */ #include +#include "staff-symbol-referencer.hh" #include "bar.hh" -#include "clef-engraver.hh" #include "clef-item.hh" #include "debug.hh" #include "command-request.hh" -#include "time-description.hh" +#include "timing-translator.hh" #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_requests(); + 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; } -/* - PUT THIS IN GUILE! - */ -struct Clef_settings { - char const *name; - char const *cleftype; - int position; -} clef_settings[] = { - {"treble", "treble", -2}, - {"violin", "treble", -2}, - {"G", "treble", -2}, - {"G2", "treble", -2}, - {"french", "treble",-4 }, - {"soprano", "alto",-4 }, - {"mezzosoprano", "alto",-2 }, - {"alto", "alto",0 }, - {"tenor", "alto",2 }, - {"baritone", "alto",4 }, - {"varbaritone", "bass",0 }, - {"bass" , "bass",2 }, - {"F", "bass", 2}, - {"subbass", "bass",4}, - {0,0,0} -}; - bool Clef_engraver::set_type (String s) { @@ -70,47 +73,28 @@ Clef_engraver::set_type (String s) else octave_dir_ = CENTER; - bool found = 0; - for (Clef_settings *c = clef_settings; !found && c->name; c++) + SCM c = get_property ("supportedClefTypes",0); + SCM p = get_property ("clefPitches", 0); + + if (gh_list_p (c)) { - if (c->name == s) - { - clef_type_str_ = c->cleftype; - clef_position_i_ = c->position; - found = 1; - } - } + SCM found = scm_assoc (ly_str02scm (s.ch_C()), c); + if (found == SCM_BOOL_F) + return false; + + clef_glyph_ = gh_cadr (found); + SCM pos = gh_caddr (found); - 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; + clef_position_i_ = gh_scm2int (pos); + + 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; } @@ -123,27 +107,20 @@ void Clef_engraver::acknowledge_element (Score_element_info info) { if (dynamic_cast(info.elem_l_) - && clef_type_str_.length_i()) - { - bool def = !clef_p_; - create_clef(); - if(def) - clef_p_->set_elt_property(visibility_lambda_scm_sym, - gh_eval_str ("postbreak_only_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)) - { - // h->position_i_ += c0_position_i_; - h->position_i_ += c0_position_i_; - } - else if (Local_key_item *i = dynamic_cast (it_l)) + if (dynamic_cast(it_l) + || 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)) { @@ -155,15 +132,12 @@ Clef_engraver::acknowledge_element (Score_element_info info) void Clef_engraver::do_creation_processing() { - create_default_b_ = true; // should read property. - Scalar def = get_property ("createInitdefaultClef", 0); - if (def.to_bool ()) // egcs: Scalar to bool is ambiguous - set_type (def); - - if (clef_type_str_.length_i ()) - { - create_clef(); - clef_p_->set_elt_property (non_default_scm_sym, SCM_BOOL_T); + SCM def = get_property ("defaultClef", 0); + if (gh_string_p (def)) + { + set_type (ly_scm2string (def)); + create_clef (); + clef_p_->set_elt_property ("non-default", SCM_BOOL_T); } } @@ -174,7 +148,7 @@ Clef_engraver::do_try_music (Music * r_l) { clef_req_l_ = cl; if (!set_type (cl->clef_str_)) - cl->error (_ ("unknown clef type ")); + cl->error (_ ("unknown clef type")); return true; } @@ -189,16 +163,21 @@ Clef_engraver::create_clef() if (!clef_p_) { Clef_item *c= new Clef_item; - c->set_elt_property (break_priority_scm_sym, gh_int2scm (-2)); // ugh + 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_->y_position_i_ = 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_scm_sym, gh_int2scm (octave_dir_)); + clef_p_->set_elt_property ("octave-dir", gh_int2scm (octave_dir_)); } } @@ -209,13 +188,7 @@ Clef_engraver::do_process_requests() if (clef_req_l_) { create_clef(); - } - else if (create_default_b_) - { - String type = get_property ("defaultClef", 0); - set_type (type.length_i () ? type : "treble"); - create_clef (); - create_default_b_ =0; + clef_p_->set_elt_property ("non-default", SCM_BOOL_T); } } @@ -224,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", + ly_eval_str ("all-visibility")); + typeset_element (clef_p_); clef_p_ =0; } - create_default_b_ = false; } void @@ -236,12 +212,8 @@ Clef_engraver::do_post_move_processing() clef_req_l_ = 0; } -void -Clef_engraver::do_removal_processing() -{ - assert (!clef_p_); -} ADD_THIS_TRANSLATOR(Clef_engraver); +