X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=084af60a3eddb46049e911148a278ae74a6a248f;hb=388121aed1734e9e536ede58bd3de98b68367842;hp=70136ac143db52259f68dc32e8f275a33138bdfa;hpb=2edcb9426a00a159847e0b4adb7c048c2d058b87;p=lilypond.git diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index 70136ac143..084af60a3e 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -3,23 +3,17 @@ 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 "engraver-group-engraver.hh" -#include "engraver.hh" -#include "lily-guile.hh" -#include "paper-column.hh" -#include "paper-def.hh" +#include -#include "side-position-interface.hh" -#include "staff-symbol-referencer.hh" +#include "bar-line.hh" +#include "context.hh" +#include "engraver-group-engraver.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,183 +22,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 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 initialize (); + 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::initialize () +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_grob (Grob_info inf) { - Grob * s = inf.elem_l_; - if (Staff_symbol::has_interface (s) - || to_boolean (s->get_grob_property ("invisible-staff"))) - { - 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::stop_translation_timestep () { - if (text_p_) + if (text_) { - text_p_->set_grob_property("side-support-elements" , get_property ("staffsFound")); - typeset_grob (text_p_); - text_p_ =0; + SCM lst = get_property ("stavesFound"); + text_->set_property ("side-support-elements" , lst); + 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); - - announce_grob (text_p_, rq); -} - - -void -Mark_engraver::start_translation_timestep () -{ - mark_req_l_ = 0; + 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::markup_p (m) && + ly_c_procedure_p (proc)) { - if (!gh_string_p (m)) + if (!scm_is_number (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); + int mark_count = scm_to_int (m); 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()); + context ()->set_property ("rehearsalMark", + scm_int2num (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"; - for (int i=0; i < t.length_i(); i++) - { - if (!isdigit(t[i])) - { - style = "large"; - 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_interface::markup_p (m)) + text_->set_property ("text", m); + else + warning ("Mark label should be markup object."); } } +ADD_TRANSLATOR (Mark_engraver, +/* descr */ "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" + , +/* creats*/ "RehearsalMark", +/* accepts */ "mark-event", +/* acks */ "bar-line-interface", +/* reads */ "rehearsalMark markFormatter stavesFound", +/* write */ "");