X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=82d27d3643687c80eeec55e565f3d6cb2e71d06f;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=ed8b7be05a0440647abc61f1ef3399e8b15ea249;hpb=762ca4af538f1d566e396a1b52e84a6bc6b919f3;p=lilypond.git diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index ed8b7be05a..82d27d3643 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -3,22 +3,18 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2002 Jan Nieuwenhuizen + (c) 1998--2004 Jan Nieuwenhuizen */ #include + #include "bar-line.hh" -#include "command-request.hh" -#include "staff-symbol.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, @@ -29,18 +25,17 @@ class Mark_engraver : public Engraver public: TRANSLATOR_DECLARATIONS(Mark_engraver); protected: - Item* text_p_; + Item* text_; protected: 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 (); + void create_items (Music*); + virtual bool try_music (Music *ev); virtual void process_music (); private: - Mark_req * mark_req_l_; + Music * mark_ev_; }; @@ -49,70 +44,54 @@ private: Mark_engraver::Mark_engraver () { - text_p_ =0; - mark_req_l_ = 0; + text_ =0; + mark_ev_ = 0; } void Mark_engraver::acknowledge_grob (Grob_info inf) { - Grob * s = inf.grob_l_; - if (text_p_ && Bar_line::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::stop_translation_timestep () { - if (text_p_) + if (text_) { - text_p_->set_grob_property ("side-support-elements" , get_property ("stavesFound")); - typeset_grob (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); - - - announce_grob(text_p_, rq->self_scm()); -} - - -void -Mark_engraver::start_translation_timestep () -{ - mark_req_l_ = 0; + text_ = make_item ("RehearsalMark"); + announce_grob(text_, ev->self_scm()); } bool -Mark_engraver::try_music (Music* r_l) +Mark_engraver::try_music (Music* r) { - 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; + mark_ev_ = r; + return true; } @@ -120,77 +99,55 @@ Mark_engraver::try_music (Music* r_l) TODO: make the increment function in Scheme. + + TODO: junk the number type for rehearsalMark */ void 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_pair_p (m)) // markup text - text_p_->set_grob_property ("text",m); - else + SCM m = mark_ev_->get_mus_property ("label"); + SCM proc = get_property ("markFormatter"); + if (!Text_item::markup_p (m) && + gh_procedure_p (proc)) { - if (!gh_string_p (m)) + if (!gh_number_p (m)) m = get_property ("rehearsalMark"); - ; - - if (gh_number_p (m)) + + if (scm_integer_p (m) == SCM_BOOL_T + && scm_exact_p (m) == SCM_BOOL_T) { 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 ()); + 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 - { - m = gh_int2scm (1); - } - - daddy_trans_l_->set_property ("rehearsalMark", m); - - text_p_->set_grob_property ("text", - ly_str02scm (t.ch_C ())); - - String style = "mark-number"; - for (int i=0; i < t.length_i (); i++) - { - if (!isdigit (t[i])) - { - style = "mark-letter"; - break; - } - } - SCM st = ly_symbol2scm (style.ch_C ()); - text_p_->set_grob_property ("font-style", st); + warning ("rehearsalMark does not have integer value."); } + 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", -/* acks */ "bar-line-interface", -/* reads */ "rehearsalMark stavesFound", +/* accepts */ "mark-event", +/* acks */ "bar-line-interface", +/* reads */ "rehearsalMark markFormatter stavesFound", /* write */ "");