X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=4bbda428240109ac6f86c5e0c8387a81cab4bcf8;hb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;hp=0f2df8fcdf5e3b05744eb83ad47bbdfe92d6e83d;hpb=277d986b4aa1172813b9a2a7a4daa86983d26d73;p=lilypond.git diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index 0f2df8fcdf..4bbda42824 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,62 +27,54 @@ class Mark_engraver : public Engraver { public: - VIRTUAL_COPY_CONS(Translator); - Mark_engraver (); + TRANSLATOR_DECLARATIONS(Mark_engraver); protected: - Item* text_p_; - Protected_scm staffs_; + Item* text_; 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); + virtual void start_translation_timestep (); + virtual void process_music (); + private: - Mark_req * mark_req_l_; + Mark_req * mark_req_; }; -ADD_THIS_TRANSLATOR (Mark_engraver); + Mark_engraver::Mark_engraver () { - text_p_ =0; - mark_req_l_ = 0; - staffs_ = SCM_EOL; + text_ =0; + mark_req_ = 0; } - - 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_; + if (text_ && Bar_line::has_interface (s)) { /* Ugh. Figure out how to do this right at beginning of line, (without creating class Bar_script : public Item). */ - text_p_->set_parent (s, X_AXIS); + text_->set_parent (s, X_AXIS); } } void -Mark_engraver::do_pre_move_processing () +Mark_engraver::stop_translation_timestep () { - if (text_p_) + if (text_) { - text_p_->set_elt_property("side-support-elements" , staffs_); - typeset_element (text_p_); - text_p_ =0; + text_->set_grob_property ("side-support-elements" , get_property ("stavesFound")); + typeset_grob (text_); + text_ =0; } } @@ -91,70 +82,51 @@ Mark_engraver::do_pre_move_processing () void Mark_engraver::create_items (Request *rq) { - if (text_p_) + if (text_) return; - SCM s = get_property ("basicMarkProperties"); - text_p_ = new Item (s); - - - Side_position::set_axis (text_p_, Y_AXIS); + SCM s = get_property ("RehearsalMark"); + text_ = new Item (s); - /* - -> 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_, rq->self_scm()); } void -Mark_engraver::do_post_move_processing () +Mark_engraver::start_translation_timestep () { - mark_req_l_ = 0; + mark_req_ = 0; } bool -Mark_engraver::do_try_music (Music* r_l) +Mark_engraver::try_music (Music* r) { - if (Mark_req *mr = dynamic_cast (r_l)) + if (Mark_req *mr = dynamic_cast (r)) { - if (mark_req_l_ && mr->equal_b (mark_req_l_)) + if (mark_req_ && mr->equal_b (mark_req_)) return true; - if (mark_req_l_) + if (mark_req_) return false; - mark_req_l_ = mr; + mark_req_ = mr; return true; } return false; } + +/* + + TODO: make the increment function in Scheme. + +*/ void -Mark_engraver::do_process_music () +Mark_engraver::process_music () { - if (mark_req_l_) + if (mark_req_) { - create_items (mark_req_l_); + create_items (mark_req_); String t; @@ -162,52 +134,62 @@ Mark_engraver::do_process_music () automatic marks. */ - 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)) + SCM m = mark_req_->get_mus_property ("label"); + if (gh_pair_p (m)) // markup text + text_->set_grob_property ("text",m); + else { - t = ly_scm2string (m); - String next; - if (t.length_i ()) + if (!gh_string_p (m) && !gh_number_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_string (mark_count); + mark_count ++; + m = gh_int2scm (mark_count); + } + else if (gh_string_p (m)) + { + t = ly_scm2string (m); + String next; + if (t.length ()) + { + char c = t[0]; + c++; + next = to_string (c); + } + m = ly_str02scm (next.to_str0 ()); + } + 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_->set_property ("rehearsalMark", m); + + text_->set_grob_property ("text", + ly_str02scm (t.to_str0 ())); - 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++) { - style = "large"; - break; + if (!isdigit (t[i])) + { + style = "mark-letter"; + break; + } } + SCM st = ly_symbol2scm (style.to_str0 ()); + text_->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 */ "");