X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=67ad8848248c6ac091ac73f23ba80efbedd1d973;hb=3e1a1c11067f26331b1c794e296c65b0984054a9;hp=0f2df8fcdf5e3b05744eb83ad47bbdfe92d6e83d;hpb=277d986b4aa1172813b9a2a7a4daa86983d26d73;p=lilypond.git diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index 0f2df8fcdf..67ad884824 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -1,213 +1,187 @@ /* - mark-engraver.cc -- implement Mark_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1998--2011 Jan Nieuwenhuizen - (c) 1998--2000 Jan Nieuwenhuizen + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ -#include -#include "bar.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 "protected-scm.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 "stream-event.hh" +#include "text-interface.hh" +#include "warn.hh" + +#include "translator.icc" /** - 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: - VIRTUAL_COPY_CONS(Translator); - Mark_engraver (); -protected: - Item* text_p_; - Protected_scm staffs_; - -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 (); -private: - Mark_req * mark_req_l_; -}; + void create_items (Stream_event *); + Item *text_; + Item *final_text_; + Stream_event *mark_ev_; + +public: + TRANSLATOR_DECLARATIONS (Mark_engraver); -ADD_THIS_TRANSLATOR (Mark_engraver); +protected: + void process_music (); + void start_translation_timestep (); + void stop_translation_timestep (); + virtual void finalize (); + DECLARE_TRANSLATOR_LISTENER (mark); + DECLARE_ACKNOWLEDGER (break_alignment); +}; Mark_engraver::Mark_engraver () { - text_p_ =0; - mark_req_l_ = 0; - staffs_ = SCM_EOL; + text_ = 0; + final_text_ = 0; + mark_ev_ = 0; } - - void -Mark_engraver::acknowledge_element (Score_element_info inf) +Mark_engraver::acknowledge_break_alignment (Grob_info inf) { - Score_element * s = inf.elem_l_; - if (Staff_symbol::has_interface (s)) - { - staffs_ = gh_cons (inf.elem_l_->self_scm (), staffs_); - } - else if (text_p_ && Bar::has_interface (s)) - { - /* - Ugh. Figure out how to do this right at beginning of line, (without - creating class Bar_script : public Item). - */ - text_p_->set_parent (s, X_AXIS); - } + Grob *s = inf.grob (); + if (text_ + && dynamic_cast (s)) + text_->set_parent (s, X_AXIS); } -void -Mark_engraver::do_pre_move_processing () +void +Mark_engraver::start_translation_timestep () { - if (text_p_) - { - text_p_->set_elt_property("side-support-elements" , staffs_); - typeset_element (text_p_); - text_p_ =0; - } + final_text_ = 0; } - void -Mark_engraver::create_items (Request *rq) +Mark_engraver::stop_translation_timestep () { - if (text_p_) - return; - - SCM s = get_property ("basicMarkProperties"); - 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 ("interline"))); - } - - - announce_element (text_p_, rq); + if (text_) + { + text_->set_object ("side-support-elements", + grob_list_to_grob_array (get_property ("stavesFound"))); + final_text_ = text_; + text_ = 0; + } + mark_ev_ = 0; } - void -Mark_engraver::do_post_move_processing () +Mark_engraver::finalize () { - mark_req_l_ = 0; + if (final_text_) + final_text_->set_property ("break-visibility", + scm_c_make_vector (3, SCM_BOOL_T)); + final_text_ = 0; } +void +Mark_engraver::create_items (Stream_event *ev) +{ + if (text_) + return; + + text_ = make_item ("RehearsalMark", ev->self_scm ()); +} -bool -Mark_engraver::do_try_music (Music* r_l) +IMPLEMENT_TRANSLATOR_LISTENER (Mark_engraver, mark); +void +Mark_engraver::listen_mark (Stream_event *ev) { - 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; + ASSIGN_EVENT_ONCE (mark_ev_, ev); } +/* + TODO: make the increment function in Scheme. +*/ 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_property ("label"); + SCM proc = get_property ("markFormatter"); + if (!Text_interface::is_markup (m) + && ly_is_procedure (proc)) { - if (!isdigit(t[i])) + if (!scm_is_number (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 = 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 + /* FIXME: constant error message. */ + warning (_ ("rehearsalMark must have integer value")); } - SCM st = ly_str02scm (style.ch_C()); - text_p_->set_elt_property ("style", st); + + if (Text_interface::is_markup (m)) + text_->set_property ("text", m); + else + warning (_ ("mark label must be a markup object")); } } +ADD_ACKNOWLEDGER (Mark_engraver, break_alignment); + +ADD_TRANSLATOR (Mark_engraver, + /* doc */ + "Create @code{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@tie{}location.", + + /* create */ + "RehearsalMark ", + + /* read */ + "markFormatter " + "rehearsalMark " + "stavesFound ", + + /* write */ + "" + );