X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=ed8b7be05a0440647abc61f1ef3399e8b15ea249;hb=e10092f994cb34537e4cfb1f4848c1f610cd58ff;hp=b57bafa3e28b2c280535a81553f76d31d2bf506b;hpb=423672df912e589e50a7ffc4ff1700a6a9b32811;p=lilypond.git diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index b57bafa3e2..ed8b7be05a 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -3,11 +3,11 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2002 Jan Nieuwenhuizen */ #include -#include "bar.hh" +#include "bar-line.hh" #include "command-request.hh" #include "staff-symbol.hh" #include "engraver-group-engraver.hh" @@ -15,7 +15,6 @@ #include "lily-guile.hh" #include "paper-column.hh" #include "paper-def.hh" -#include "protected-scm.hh" #include "side-position-interface.hh" #include "staff-symbol-referencer.hh" #include "item.hh" @@ -28,45 +27,37 @@ class Mark_engraver : public Engraver { public: - VIRTUAL_COPY_CONS(Translator); - Mark_engraver (); + TRANSLATOR_DECLARATIONS(Mark_engraver); protected: Item* text_p_; - Protected_scm staffs_; 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 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 process_music (); + private: Mark_req * mark_req_l_; }; -ADD_THIS_TRANSLATOR (Mark_engraver); + Mark_engraver::Mark_engraver () { text_p_ =0; mark_req_l_ = 0; - staffs_ = SCM_EOL; } - - 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)) - { - staffs_ = gh_cons (inf.elem_l_->self_scm (), staffs_); - } - else if (text_p_ && Bar::has_interface (s)) + Grob * s = inf.grob_l_; + if (text_p_ && Bar_line::has_interface (s)) { /* Ugh. Figure out how to do this right at beginning of line, (without @@ -77,12 +68,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" , staffs_); - typeset_element (text_p_); + text_p_->set_grob_property ("side-support-elements" , get_property ("stavesFound")); + typeset_grob (text_p_); text_p_ =0; } } @@ -94,48 +85,23 @@ Mark_engraver::create_items (Request *rq) if (text_p_) return; - SCM s = get_property ("basicMarkProperties"); + SCM s = get_property ("RehearsalMark"); text_p_ = new Item (s); - Side_position::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 ("interline"))); - } - - - announce_element (text_p_, rq); + announce_grob(text_p_, rq->self_scm()); } 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)) { @@ -149,8 +115,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_) { @@ -163,51 +135,62 @@ 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)) - { - int mark_count = gh_scm2int (m); - t = to_str (mark_count); - mark_count ++; - m = gh_int2scm (mark_count); - } - else if (gh_string_p (m)) + if (gh_pair_p (m)) // markup text + text_p_->set_grob_property ("text",m); + else { - 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-number"; + for (int i=0; i < t.length_i (); i++) { - style = "large"; - break; + if (!isdigit (t[i])) + { + style = "mark-letter"; + 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); + } } +ENTER_DESCRIPTION(Mark_engraver, +/* descr */ "", +/* creats*/ "RehearsalMark", +/* acks */ "bar-line-interface", +/* reads */ "rehearsalMark stavesFound", +/* write */ "");