X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-number-engraver.cc;h=88055cb0bbf00702476370ef8155e012d62627e2;hb=3ee0df13c3fe001cef0bef15adcbadfb2c394fd8;hp=926bc0b50a6013192305c28fb3675f5d658e2b69;hpb=e7d84e6728ecfdf74d8f214486a29c2aca199819;p=lilypond.git diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index 926bc0b50a..88055cb0bb 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -1,144 +1,138 @@ /* - bar-number-grav.cc -- implement Bar_number_engraver + bar-number-engraver.cc -- implement Bar_number_engraver source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ - -#include "lily-guile.hh" #include "paper-column.hh" -#include "paper-def.hh" +#include "output-def.hh" #include "side-position-interface.hh" -#include "staff-symbol.hh" -#include "text-item.hh" -#include "moment.hh" #include "engraver.hh" -#include "protected-scm.hh" +#include "context.hh" +#include "grob-array.hh" + +#include "translator.icc" +/* + TODO: detect the top staff (stavesFound), and acknowledge staff-group + system-start-delims. If we find these, and the top staff is in the + staff-group, add padding to the bar number. +*/ class Bar_number_engraver : public Engraver { protected: - Text_item* text_p_; - Protected_scm visibility_lambda_; - Protected_scm staffs_; - + Item *text_; protected: - virtual void do_creation_processing (); - virtual void do_pre_move_processing (); - virtual void acknowledge_element (Score_element_info); - void create_items(); - void do_process_music (); -public: - VIRTUAL_COPY_CONS(Translator); - Bar_number_engraver(); + void stop_translation_timestep (); + DECLARE_ACKNOWLEDGER (break_aligned); + DECLARE_ACKNOWLEDGER (break_alignment); + void process_music (); + void create_items (); + TRANSLATOR_DECLARATIONS (Bar_number_engraver); }; void -Bar_number_engraver::do_process_music () +Bar_number_engraver::process_music () { - // todo include (&&!time->cadenza_b_ ) - SCM bn = get_property("currentBarNumber"); - SCM smp = get_property ("measurePosition"); - Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); - - if (gh_number_p (bn) && - !mp && now_mom () > Moment (0)) - { - create_items (); + // todo include (&&!time->cadenza_b_) + + SCM wb = get_property ("whichBar"); - // guh. - text_p_->set_elt_property ("text", - ly_str02scm (to_str (gh_scm2int (bn)).ch_C())); + if (scm_is_string (wb)) + { + Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0))); + if (mp.main_part_ == Rational (0)) + { + SCM bn = get_property ("currentBarNumber"); + SCM proc = get_property ("barNumberVisibility"); + if (scm_is_number (bn) && ly_is_procedure (proc) + && to_boolean (scm_call_1 (proc, bn))) + { + create_items (); + // guh. + text_->set_property + ("text", scm_number_to_string (bn, scm_from_int (10))); + } + } } } -ADD_THIS_TRANSLATOR(Bar_number_engraver); - Bar_number_engraver::Bar_number_engraver () { - text_p_ =0; - staffs_ = SCM_EOL; + text_ = 0; } -void -Bar_number_engraver::do_creation_processing () -{ - String t = "barNumberVisibilityFunction"; - SCM proc = get_property (t); - - if (gh_procedure_p (proc)) - visibility_lambda_ = proc; -} - - +/* + see rehearsal mark comments. + */ void -Bar_number_engraver::acknowledge_element (Score_element_info inf) +Bar_number_engraver::acknowledge_break_aligned (Grob_info inf) { - Score_element * s = inf.elem_l_; - if (dynamic_cast (s)) - { - staffs_ = gh_cons (inf.elem_l_->self_scm_, staffs_); - } - else if (text_p_ - && dynamic_cast (s) - && s->get_elt_property ("break-align-symbol") == ly_symbol2scm ("Left_edge_item")) + Grob *s = inf.grob (); + if (text_ + && !text_->get_parent (X_AXIS) + && dynamic_cast (s) + && (s->get_property_data ("break-align-symbol") + == text_->get_property_data ("break-align-symbol"))) { /* By default this would land on the Paper_column -- so why doesn't it work when you leave this out? */ - text_p_->set_parent (s, X_AXIS); + text_->set_parent (s, X_AXIS); } } -void -Bar_number_engraver::do_pre_move_processing () + +void +Bar_number_engraver::acknowledge_break_alignment (Grob_info inf) { - if (text_p_) + Grob *s = inf.grob (); + if (text_ + && dynamic_cast (s)) { - text_p_->set_elt_pointer ("side-support-elements", staffs_); - typeset_element (text_p_); - text_p_ =0; + text_->set_parent (s, X_AXIS); } } - void -Bar_number_engraver::create_items () +Bar_number_engraver::stop_translation_timestep () { - if (text_p_) - return; - - text_p_ = new Text_item; - text_p_->set_elt_property ("breakable", SCM_BOOL_T); // ugh - Side_position_interface staffside(text_p_); - staffside.set_axis (Y_AXIS); - - SCM prop = get_property ("barNumberDirection"); - if (!isdir_b (prop)) - { - prop = gh_int2scm (UP); - } - text_p_->set_elt_property ("direction", prop); - - SCM padding = get_property ("barNumberScriptPadding"); - if (gh_number_p(padding)) + if (text_) { - text_p_->set_elt_property ("padding", padding); - } - else - { - text_p_ - ->set_elt_property ("padding", - gh_double2scm(paper_l ()->get_var ("interline"))); + text_->set_object ("side-support-elements", + grob_list_to_grob_array (get_property ("stavesFound"))); + text_ = 0; } +} - if (gh_procedure_p (visibility_lambda_)) - text_p_->set_elt_property ("visibility-lambda", - visibility_lambda_); +void +Bar_number_engraver::create_items () +{ + if (text_) + return; - announce_element (Score_element_info (text_p_, 0)); + text_ = make_item ("BarNumber", SCM_EOL); } + +ADD_ACKNOWLEDGER(Bar_number_engraver,break_aligned); +ADD_ACKNOWLEDGER(Bar_number_engraver,break_alignment); + +ADD_TRANSLATOR (Bar_number_engraver, + /* doc */ "A bar number is created whenever measurePosition " + "is zero and when there is a bar line (ie. when @code{whichBar} is set. " + "It is \n" + "put on top of all staves, and appears only at left side of the staff. " + "The staves are taken from @code{stavesFound}, which is maintained by " + "@code{@ref{Staff_collecting_engraver}}. ", + + /* create */ "BarNumber", + /* read */ + "currentBarNumber " + "whichBar " + "stavesFound " + "barNumberVisibility ", + /* write */ "");