X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=faaa30c800c5922fdfab89c78afc7dfc9691163e;hb=d8138e9ca4e95622dfebfa470dce64d23eaf2931;hp=eeada948563860f7cb47457961907211068c121a;hpb=9b40d66187029df3dca86fc5ecc65f64db315a48;p=lilypond.git diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index eeada94856..faaa30c800 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ #include @@ -28,19 +28,19 @@ class Mark_engraver : public Engraver { public: - VIRTUAL_COPY_CONS(Translator); + VIRTUAL_COPY_CONS (Translator); Mark_engraver (); protected: Item* text_p_; protected: - virtual void do_pre_move_processing (); - virtual void acknowledge_element (Score_element_info); - void create_items(Request*); - virtual bool do_try_music (Music *req_l); - virtual void do_process_music (); - virtual void do_post_move_processing (); - virtual void do_creation_processing (); + virtual void stop_translation_timestep (); + virtual void acknowledge_grob (Grob_info); + void create_items (Request*); + virtual bool try_music (Music *req_l); + virtual void start_translation_timestep (); + virtual void initialize (); + virtual void process_music (); private: Mark_req * mark_req_l_; @@ -57,22 +57,23 @@ Mark_engraver::Mark_engraver () } void -Mark_engraver::do_creation_processing () +Mark_engraver::initialize () { - daddy_trans_l_->set_property ("staffsFound", SCM_EOL); // ugh: sharing with barnumber grav. + daddy_trans_l_->set_property ("stavesFound", SCM_EOL); // ugh: sharing with barnumber grav. } void -Mark_engraver::acknowledge_element (Score_element_info inf) +Mark_engraver::acknowledge_grob (Grob_info inf) { - Score_element * s = inf.elem_l_; - if (Staff_symbol::has_interface (s)) + Grob * s = inf.elem_l_; + if (Staff_symbol::has_interface (s) + || to_boolean (s->get_grob_property ("invisible-staff"))) { - SCM sts = get_property ("staffsFound"); + SCM sts = get_property ("stavesFound"); SCM thisstaff = inf.elem_l_->self_scm (); if (scm_memq (thisstaff, sts) == SCM_BOOL_F) - daddy_trans_l_->set_property ("staffsFound", gh_cons (thisstaff, sts)); + daddy_trans_l_->set_property ("stavesFound", gh_cons (thisstaff, sts)); } else if (text_p_ && Bar::has_interface (s)) { @@ -85,12 +86,12 @@ Mark_engraver::acknowledge_element (Score_element_info inf) } void -Mark_engraver::do_pre_move_processing () +Mark_engraver::stop_translation_timestep () { if (text_p_) { - text_p_->set_elt_property("side-support-elements" , get_property ("staffsFound")); - typeset_element (text_p_); + text_p_->set_grob_property ("side-support-elements" , get_property ("stavesFound")); + typeset_grob (text_p_); text_p_ =0; } } @@ -106,44 +107,21 @@ Mark_engraver::create_items (Request *rq) text_p_ = new Item (s); - Side_position::set_axis (text_p_, Y_AXIS); + Side_position_interface::set_axis (text_p_, Y_AXIS); - /* - -> Generic props. - */ - SCM prop = get_property ("markDirection"); - if (!isdir_b (prop)) - { - prop = gh_int2scm (UP); - } - text_p_->set_elt_property ("direction", prop); - - SCM padding = get_property ("markScriptPadding"); - if (gh_number_p(padding)) - { - text_p_->set_elt_property ("padding", padding); - } - else - { - text_p_ - ->set_elt_property ("padding", - gh_double2scm(paper_l ()->get_var ("staffspace"))); - } - - - announce_element (text_p_, rq); + announce_grob (text_p_, rq); } void -Mark_engraver::do_post_move_processing () +Mark_engraver::start_translation_timestep () { mark_req_l_ = 0; } bool -Mark_engraver::do_try_music (Music* r_l) +Mark_engraver::try_music (Music* r_l) { if (Mark_req *mr = dynamic_cast (r_l)) { @@ -157,8 +135,14 @@ Mark_engraver::do_try_music (Music* r_l) return false; } + +/* + + TODO: make the increment function in Scheme. + +*/ void -Mark_engraver::do_process_music () +Mark_engraver::process_music () { if (mark_req_l_) { @@ -171,51 +155,56 @@ Mark_engraver::do_process_music () */ SCM m = mark_req_l_->get_mus_property ("label"); - if (!gh_string_p (m)) - m = get_property ("rehearsalMark"); -; - - if (gh_number_p (m)) + if (gh_pair_p (m)) // markup text + text_p_->set_grob_property ("text",m); + else { - int mark_count = gh_scm2int (m); - t = to_str (mark_count); - mark_count ++; - m = gh_int2scm (mark_count); - } - else if (gh_string_p (m)) - { - t = ly_scm2string (m); - String next; - if (t.length_i ()) + if (!gh_string_p (m)) + m = get_property ("rehearsalMark"); + ; + + if (gh_number_p (m)) { - char c = t[0]; - c++; - next = to_str (c); + int mark_count = gh_scm2int (m); + t = to_str (mark_count); + mark_count ++; + m = gh_int2scm (mark_count); + } + else if (gh_string_p (m)) + { + t = ly_scm2string (m); + String next; + if (t.length_i ()) + { + char c = t[0]; + c++; + next = to_str (c); + } + m = ly_str02scm (next.ch_C ()); + } + else + { + m = gh_int2scm (1); } - m = ly_str02scm (next.ch_C()); - } - else - { - m = gh_int2scm (1); - } - daddy_trans_l_->set_property ("rehearsalMark", m); - - - text_p_->set_elt_property ("text", - ly_str02scm ( t.ch_C())); + daddy_trans_l_->set_property ("rehearsalMark", m); + + text_p_->set_grob_property ("text", + ly_str02scm (t.ch_C ())); - String style = "mark"; - for (int i=0; i < t.length_i(); i++) - { - if (!isdigit(t[i])) + String style = "mark"; + for (int i=0; i < t.length_i (); i++) { - style = "large"; - break; + if (!isdigit (t[i])) + { + style = "large"; + break; + } } + SCM st = ly_symbol2scm (style.ch_C ()); + text_p_->set_grob_property ("font-style", st); } - SCM st = ly_str02scm (style.ch_C()); - text_p_->set_elt_property ("style", st); + } }