X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=92bf4952c265902d89695fb477a0996f46cecf37;hb=deba20843656c9de2a4f2b616131e27c2c47d508;hp=335fea8bdae466d83dc202a7c135540b0680ec18;hpb=ca0b17c8114a61e317c2cd7d4fe4e2661337aebf;p=lilypond.git diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index 335fea8bda..92bf4952c2 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -3,186 +3,142 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2002 Jan Nieuwenhuizen + (c) 1998--2005 Jan Nieuwenhuizen */ -#include +#include + #include "bar-line.hh" -#include "command-request.hh" -#include "staff-symbol.hh" +#include "context.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-interface.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); + TRANSLATOR_DECLARATIONS (Mark_engraver); protected: - Item* text_; - + Item *text_; protected: virtual void stop_translation_timestep (); virtual void acknowledge_grob (Grob_info); - void create_items (Music*); - virtual bool try_music (Music *req); - virtual void start_translation_timestep (); + void create_items (Music *); + virtual bool try_music (Music *ev); virtual void process_music (); - + private: - Music * mark_req_; + Music *mark_ev_; }; - - - - Mark_engraver::Mark_engraver () { - text_ =0; - mark_req_ = 0; + text_ = 0; + mark_ev_ = 0; } void Mark_engraver::acknowledge_grob (Grob_info inf) { - Grob * s = inf.grob_; + 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_->set_parent (s, X_AXIS); } } -void +void Mark_engraver::stop_translation_timestep () { if (text_) { - text_->set_grob_property ("side-support-elements" , get_property ("stavesFound")); - typeset_grob (text_); - text_ =0; + SCM lst = get_property ("stavesFound"); + text_->set_property ("side-support-elements", lst); + text_ = 0; } + mark_ev_ = 0; } - void -Mark_engraver::create_items (Music *rq) +Mark_engraver::create_items (Music *ev) { if (text_) return; - SCM s = get_property ("RehearsalMark"); - text_ = new Item (s); - - - announce_grob(text_, rq->self_scm()); -} - - -void -Mark_engraver::start_translation_timestep () -{ - mark_req_ = 0; + text_ = make_item ("RehearsalMark", ev->self_scm ()); } - bool -Mark_engraver::try_music (Music* r) +Mark_engraver::try_music (Music *r) { - mark_req_ = r; + mark_ev_ = r; return true; } - /* - TODO: make the increment function in Scheme. - */ void Mark_engraver::process_music () { - if (mark_req_) + if (mark_ev_) { - create_items (mark_req_); - - String t; + create_items (mark_ev_); /* automatic marks. - */ - - SCM m = mark_req_->get_mus_property ("label"); - if (gh_pair_p (m)) // markup text - text_->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) && !gh_number_p (m)) - m = get_property ("rehearsalMark"); - - if (gh_number_p (m)) - { - int mark_count = gh_scm2int (m); - t = to_string (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 ()) - { - char c = t[0]; - c++; - next = to_string (c); - } - m = scm_makfrom0str (next.to_str0 ()); + int mark_count = scm_to_int (m); + mark_count++; + 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_->set_property ("rehearsalMark", m); - - text_->set_grob_property ("text", - scm_makfrom0str (t.to_str0 ())); - - String style = "mark-number"; - for (int i=0; i < t.length (); i++) - { - if (!isdigit (t[i])) - { - style = "mark-letter"; - break; - } - } - SCM st = ly_symbol2scm (style.to_str0 ()); - text_->set_grob_property ("font-style", st); + /* FIXME: constant error message. */ + warning (_ ("rehearsalMark must have integer value")); } + if (Text_interface::markup_p (m)) + text_->set_property ("text", m); + else + warning (_ ("mark label must be a markup object")); } } -ENTER_DESCRIPTION(Mark_engraver, -/* descr */ "", -/* creats*/ "RehearsalMark", -/* accepts */ "mark-event", -/* acks */ "bar-line-interface", -/* reads */ "rehearsalMark stavesFound", -/* write */ ""); +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 */ "");