X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=82d27d3643687c80eeec55e565f3d6cb2e71d06f;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=eeada948563860f7cb47457961907211068c121a;hpb=9b40d66187029df3dca86fc5ecc65f64db315a48;p=lilypond.git diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index eeada94856..82d27d3643 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -3,23 +3,18 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2004 Jan Nieuwenhuizen */ #include -#include "bar.hh" -#include "command-request.hh" -#include "staff-symbol.hh" + +#include "bar-line.hh" + #include "engraver-group-engraver.hh" #include "engraver.hh" -#include "lily-guile.hh" -#include "paper-column.hh" -#include "paper-def.hh" - -#include "side-position-interface.hh" -#include "staff-symbol-referencer.hh" #include "item.hh" -#include "group-interface.hh" +#include "warn.hh" +#include "text-item.hh" /** put stuff over or next to bars. Examples: bar numbers, marginal notes, @@ -28,194 +23,131 @@ class Mark_engraver : public Engraver { public: - VIRTUAL_COPY_CONS(Translator); - Mark_engraver (); + TRANSLATOR_DECLARATIONS(Mark_engraver); protected: - Item* text_p_; + 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 do_creation_processing (); + virtual void stop_translation_timestep (); + virtual void acknowledge_grob (Grob_info); + void create_items (Music*); + virtual bool try_music (Music *ev); + virtual void process_music (); private: - Mark_req * mark_req_l_; + Music * mark_ev_; }; -ADD_THIS_TRANSLATOR (Mark_engraver); -Mark_engraver::Mark_engraver () -{ - text_p_ =0; - mark_req_l_ = 0; -} -void -Mark_engraver::do_creation_processing () +Mark_engraver::Mark_engraver () { - daddy_trans_l_->set_property ("staffsFound", SCM_EOL); // ugh: sharing with barnumber grav. + text_ =0; + mark_ev_ = 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)) - { - SCM sts = get_property ("staffsFound"); - 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)); - } - 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). + TODO: make this configurable. RehearsalMark cannot be + break-aligned, since the width of the object should not be taken + into alignment considerations. */ - 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" , get_property ("staffsFound")); - typeset_element (text_p_); - text_p_ =0; + text_->set_grob_property ("side-support-elements" , get_property ("stavesFound")); + typeset_grob (text_); + text_ =0; } + mark_ev_ = 0; } void -Mark_engraver::create_items (Request *rq) +Mark_engraver::create_items (Music *ev) { - if (text_p_) + if (text_) return; - 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 ("staffspace"))); - } - - - announce_element (text_p_, rq); + text_ = make_item ("RehearsalMark"); + announce_grob(text_, ev->self_scm()); } -void -Mark_engraver::do_post_move_processing () +bool +Mark_engraver::try_music (Music* r) { - mark_req_l_ = 0; + mark_ev_ = r; + return true; } -bool -Mark_engraver::do_try_music (Music* r_l) -{ - if (Mark_req *mr = dynamic_cast (r_l)) - { - if (mark_req_l_ && mr->equal_b (mark_req_l_)) - return true; - if (mark_req_l_) - return false; - mark_req_l_ = mr; - return true; - } - return false; -} +/* + + TODO: make the increment function in Scheme. + + TODO: junk the number type for rehearsalMark +*/ void -Mark_engraver::do_process_music () +Mark_engraver::process_music () { - if (mark_req_l_) + if (mark_ev_) { - create_items (mark_req_l_); - - String t; + create_items (mark_ev_); /* 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)) - { - 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); - } - - daddy_trans_l_->set_property ("rehearsalMark", m); - text_p_->set_elt_property ("text", - ly_str02scm ( t.ch_C())); - - String style = "mark"; - for (int i=0; i < t.length_i(); i++) + SCM m = mark_ev_->get_mus_property ("label"); + SCM proc = get_property ("markFormatter"); + if (!Text_item::markup_p (m) && + gh_procedure_p (proc)) { - if (!isdigit(t[i])) + if (!gh_number_p (m)) + m = get_property ("rehearsalMark"); + + if (scm_integer_p (m) == SCM_BOOL_T + && scm_exact_p (m) == SCM_BOOL_T) { - style = "large"; - break; + int mark_count = gh_scm2int (m); + mark_count ++; + daddy_trans_->set_property ("rehearsalMark", + gh_int2scm (mark_count)); } + + if (gh_number_p (m)) + m = scm_call_2 (proc, m, daddy_trans_->self_scm ()); + else + warning ("rehearsalMark does not have integer value."); } - SCM st = ly_str02scm (style.ch_C()); - text_p_->set_elt_property ("style", st); + + if (Text_item::markup_p (m)) + text_->set_grob_property ("text", m); + else + warning ("Mark label should be markup object."); } } +ENTER_DESCRIPTION(Mark_engraver, +/* descr */ "", +/* creats*/ "RehearsalMark", +/* accepts */ "mark-event", +/* acks */ "bar-line-interface", +/* reads */ "rehearsalMark markFormatter stavesFound", +/* write */ "");