X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fclef-engraver.cc;h=bfd3c54f5a2a565b046fa92c31447b948453a383;hb=refs%2Ftags%2Frelease%2F1.3.42;hp=8195fbd9bf6c382b4e76f2f489e7fdcf15ac3ebf;hpb=106e5978fe2fa568bbc6649bc8fcf1134307373a;p=lilypond.git diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index 8195fbd9bf..bfd3c54f5a 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -1,38 +1,62 @@ /* - clef.cc -- implement Clef_engraver + clef-engraver.cc -- implement Clef_engraver source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys , + (c) 1997--2000 Han-Wen Nienhuys , + Mats Bengtsson */ #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_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; } -/* - Ugh. Should have support for Dictionaries in mudela. - */ bool Clef_engraver::set_type (String s) { @@ -48,98 +72,32 @@ Clef_engraver::set_type (String s) } else octave_dir_ = CENTER; - if (s == "treble" || - s == "violin" || - s == "G" || s == "G2") - { - clef_type_str_ = "violin"; - clef_position_i_ = -2; - } - else if (s == "french") - { - clef_type_str_ = "violin"; - clef_position_i_ = -4; - } - else if (s == "soprano") - { - clef_type_str_ = "alto"; - clef_position_i_ = -4; - } - else if (s == "mezzosoprano") - { - clef_type_str_ = "alto"; - clef_position_i_ = -2; - } - else if (s == "alto") - { - clef_type_str_ = "alto"; - clef_position_i_ = 0; - } - else if (s == "tenor") - { - clef_type_str_ = "alto"; - clef_position_i_ = 2; - } - else if (s == "baritone") - { - clef_type_str_ = "alto"; - clef_position_i_ = 4; - } - else if (s == "varbaritone") - { - clef_type_str_ = "bass"; - clef_position_i_ = 0; - } - else if (s == "bass" || s == "F") - { - clef_type_str_ = "bass"; - clef_position_i_ = 2; - } - else if (s == "subbass") - { - clef_type_str_ = "bass"; - clef_position_i_ = 4; - } - else + + SCM c = get_property ("supportedClefTypes"); + SCM p = get_property ("clefPitches"); + + if (gh_list_p (c)) { - switch(toupper (s[0])) - { - case 'F': - clef_type_str_ = "bass"; - break; - case 'G': - clef_type_str_ = "violin"; - break; - case 'C': - clef_type_str_ = "alto"; - break; - default: - return false; - } - clef_position_i_ = 2 * (s[1] - '0') - 6; + 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); + + 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_ == "violin") - 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; } -void -Clef_engraver::read_req (Clef_change_req*c_l) -{ - if (!set_type (c_l->clef_str_)) - c_l->error (_ ("unknown clef type ")); -} - /** Generate a clef at the start of a measure. (when you see a Bar, @@ -148,60 +106,55 @@ Clef_engraver::read_req (Clef_change_req*c_l) void Clef_engraver::acknowledge_element (Score_element_info info) { - if (info.elem_l_->is_type_b (Bar::static_name ()) - && clef_type_str_.length_i()) - { - create_clef(); - if (!clef_req_l_) - clef_p_->default_b_ = true; - } + if (dynamic_cast(info.elem_l_) + && gh_string_p (clef_glyph_)) + create_clef(); /* ugh; should make Clef_referenced baseclass */ - Item * it_l =info.elem_l_->access_Item (); -if (it_l) - { - if (it_l->is_type_b (Note_head::static_name ())) - { - Note_head * h = (Note_head*)it_l; - h->position_i_ += c0_position_i_; - } - else if (it_l->is_type_b (Local_key_item::static_name ())) - { - Local_key_item *i = (Local_key_item*)it_l; - i->c0_position_i_ =c0_position_i_; - } - else if (it_l->is_type_b (Key_item::static_name ())) + Item * it_l =dynamic_cast (info.elem_l_); + if (it_l) { - Key_item *k = (Key_item*)it_l; - k-> set_c_position (c0_position_i_); - } - } + if (dynamic_cast(it_l) + || dynamic_cast (it_l) + ) + + { + 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_elt_property ("c0-position", gh_int2scm (c0_position_i_)); + } + } } void Clef_engraver::do_creation_processing() { - Scalar def = get_property ("defaultClef"); - if (def.to_bool ()) // egcs: Scalar to bool is ambiguous - set_type (def); - - if (clef_type_str_.length_i ()) - { - create_clef(); - clef_p_->default_b_ = false; + SCM def = get_property ("defaultClef"); + if (gh_string_p (def)) + { + set_type (ly_scm2string (def)); + create_clef (); + clef_p_->set_elt_property ("non-default", SCM_BOOL_T); } } bool -Clef_engraver::do_try_request (Request * r_l) +Clef_engraver::do_try_music (Music * r_l) { - Command_req* creq_l= r_l->access_Command_req (); - if (!creq_l || !creq_l->access_Clef_change_req ()) + if (Clef_change_req *cl = dynamic_cast (r_l)) + { + clef_req_l_ = cl; + if (!set_type (cl->clef_str_)) + cl->error (_ ("unknown clef type")); + + return true; + } + else return false; - clef_req_l_ = creq_l->access_Clef_change_req (); - read_req (clef_req_l_); - return true; } void @@ -209,20 +162,33 @@ Clef_engraver::create_clef() { if (!clef_p_) { - clef_p_ = new Clef_item; - clef_p_->break_priority_i_ = -2; // ugh - announce_element (Score_element_info (clef_p_,clef_req_l_)); + Clef_item *c= new Clef_item; + c->set_elt_property ("breakable", SCM_BOOL_T); + c->set_elt_property ("break-align-symbol", ly_symbol2scm ("Clef_item")); + 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_->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_)); } - clef_p_->read (*this); } + void -Clef_engraver::do_process_requests() +Clef_engraver::do_process_music() { if (clef_req_l_) { create_clef(); - clef_p_->default_b_ = false; + clef_p_->set_elt_property ("non-default", SCM_BOOL_T); } } @@ -231,27 +197,23 @@ 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; + clef_p_ =0; } } + void Clef_engraver::do_post_move_processing() { clef_req_l_ = 0; } -void -Clef_engraver::do_removal_processing() -{ - if (clef_p_) - { - clef_p_->unlink (); - delete clef_p_; - clef_p_ =0; - } -} -IMPLEMENT_IS_TYPE_B1(Clef_engraver,Engraver); + ADD_THIS_TRANSLATOR(Clef_engraver); +