X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=cb2ac141d9e975ec9a18e3f5677394b407a77fd2;hb=17931f91895418aba963945400a613e9ee089e4b;hp=ed8b7be05a0440647abc61f1ef3399e8b15ea249;hpb=762ca4af538f1d566e396a1b52e84a6bc6b919f3;p=lilypond.git diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index ed8b7be05a..cb2ac141d9 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -3,194 +3,179 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2002 Jan Nieuwenhuizen + (c) 1998--2006 Jan Nieuwenhuizen */ -#include -#include "bar-line.hh" -#include "command-request.hh" -#include "staff-symbol.hh" -#include "engraver-group-engraver.hh" +#include +using namespace std; + #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 "axis-group-interface.hh" +#include "bar-line.hh" +#include "context.hh" +#include "grob-array.hh" +#include "international.hh" #include "item.hh" -#include "group-interface.hh" +#include "text-interface.hh" +#include "warn.hh" /** - put stuff over or next to bars. Examples: bar numbers, marginal notes, - rehearsal marks. - */ + put stuff over or next to bars. Examples: bar numbers, marginal notes, + rehearsal marks. +*/ class Mark_engraver : public Engraver { -public: - TRANSLATOR_DECLARATIONS(Mark_engraver); -protected: - Item* text_p_; - -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 (); - virtual void process_music (); - -private: - Mark_req * mark_req_l_; -}; + void create_items (Music *); + Item *text_; + Music *mark_ev_; +public: + TRANSLATOR_DECLARATIONS (Mark_engraver); +protected: + virtual bool try_music (Music *ev); + void process_music (); + void stop_translation_timestep (); + DECLARE_ACKNOWLEDGER (break_alignment); + DECLARE_ACKNOWLEDGER (break_aligned); +}; Mark_engraver::Mark_engraver () { - text_p_ =0; - mark_req_l_ = 0; + text_ = 0; + mark_ev_ = 0; } +/* + This is a flawed approach, since various break-aligned objects may + not appear depending on key signature etc. + + We keep it in case someone puts the engraver in a lower context than score. + */ void -Mark_engraver::acknowledge_grob (Grob_info inf) +Mark_engraver::acknowledge_break_aligned (Grob_info inf) { - Grob * s = inf.grob_l_; - if (text_p_ && Bar_line::has_interface (s)) + Grob *s = inf.grob (); + if (text_ + && !text_->get_parent (X_AXIS) + && (text_->get_property_data (ly_symbol2scm ("break-align-symbol")) + == s->get_property_data (ly_symbol2scm ("break-align-symbol"))) + && Axis_group_interface::has_interface (s)) { /* - Ugh. Figure out how to do this right at beginning of line, (without - creating class Bar_script : public Item). + 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 () +void +Mark_engraver::acknowledge_break_alignment (Grob_info inf) { - if (text_p_) + Grob *s = inf.grob (); + if (text_ + && dynamic_cast (s)) { - text_p_->set_grob_property ("side-support-elements" , get_property ("stavesFound")); - typeset_grob (text_p_); - text_p_ =0; + text_->set_parent (s, X_AXIS); } } void -Mark_engraver::create_items (Request *rq) +Mark_engraver::stop_translation_timestep () { - if (text_p_) - return; - - SCM s = get_property ("RehearsalMark"); - text_p_ = new Item (s); - - - announce_grob(text_p_, rq->self_scm()); + if (text_) + { + text_->set_object ("side-support-elements", + grob_list_to_grob_array (get_property ("stavesFound"))); + text_ = 0; + } + mark_ev_ = 0; } - void -Mark_engraver::start_translation_timestep () +Mark_engraver::create_items (Music *ev) { - mark_req_l_ = 0; -} + if (text_) + return; + text_ = make_item ("RehearsalMark", 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; } - /* - TODO: make the increment function in Scheme. - */ 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_property ("label"); + SCM proc = get_property ("markFormatter"); + if (!Text_interface::is_markup (m) + && ly_is_procedure (proc)) { - 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 (!scm_is_number (m)) + m = get_property ("rehearsalMark"); + + if (scm_integer_p (m) == SCM_BOOL_T + && scm_exact_p (m) == SCM_BOOL_T) { - 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 ()); + int mark_count = scm_to_int (m); + mark_count++; + context ()->set_property ("rehearsalMark", + scm_from_int (mark_count)); } + + if (scm_is_number (m)) + m = scm_call_2 (proc, m, context ()->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); + /* FIXME: constant error message. */ + warning (_ ("rehearsalMark must have integer value")); } + if (Text_interface::is_markup (m)) + text_->set_property ("text", m); + else + warning (_ ("mark label must be a markup object")); } } -ENTER_DESCRIPTION(Mark_engraver, -/* descr */ "", -/* creats*/ "RehearsalMark", -/* acks */ "bar-line-interface", -/* reads */ "rehearsalMark stavesFound", -/* write */ ""); +#include "translator.icc" + +ADD_ACKNOWLEDGER (Mark_engraver, break_aligned); +ADD_ACKNOWLEDGER (Mark_engraver, break_alignment); + +ADD_TRANSLATOR (Mark_engraver, + /* doc */ "This engraver will create RehearsalMark objects. " + "It puts them on top of all staves (which is taken from " + "the property @code{stavesFound}). If moving this engraver " + "to a different context, " + "@ref{Staff_collecting_engraver} must move along, otherwise all marks" + "end up on the same Y-location", + + /* create */ "RehearsalMark", + /* accept */ "mark-event", + /* read */ + "markFormatter " + "rehearsalMark " + "stavesFound ", + + /* write */ "");