X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-number-engraver.cc;h=82bc09f0ed02160e009868013bb31fcb9299f517;hb=efa27ffaef14a901027e0f7d9a9e5e55563715db;hp=4fe7d7172f13a6684cf52acfc673978cd75b733c;hpb=f1346920f64c571a1475d3ded295b9637560c6bc;p=lilypond.git diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index 4fe7d7172f..82bc09f0ed 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -1,140 +1,129 @@ /* - bar-number-grav.cc -- implement Bar_number_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2011 Han-Wen Nienhuys - (c) 1997--2000 Han-Wen Nienhuys -*/ + 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 "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 "item.hh" -#include "moment.hh" #include "engraver.hh" -#include "translator-group.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: - Item* text_p_; - + Item *text_; protected: - virtual void do_pre_move_processing (); - virtual void acknowledge_element (Score_element_info); - virtual void do_creation_processing (); - void create_items(); - void do_process_music (); -public: - VIRTUAL_COPY_CONS(Translator); - Bar_number_engraver(); + void stop_translation_timestep (); + 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 (); + 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; + text_ = 0; } void -Bar_number_engraver::do_creation_processing () -{ - /* - ugh: need to share code with mark_engraver - */ - daddy_trans_l_->set_property ("staffsFound", SCM_EOL); -} - - - -void -Bar_number_engraver::acknowledge_element (Score_element_info inf) +Bar_number_engraver::acknowledge_break_alignment (Grob_info inf) { - Score_element * s = inf.elem_l_; - if (Staff_symbol::has_interface (s)) + Grob *s = inf.grob (); + if (text_ + && dynamic_cast (s)) { - 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_ - && dynamic_cast (s) - && s->get_elt_property ("break-align-symbol") == ly_symbol2scm ("Left_edge_item")) - { - /* - 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::stop_translation_timestep () { - if (text_p_) + if (text_) { - text_p_->set_elt_property ("side-support-elements", get_property ("staffsFound")); - typeset_element (text_p_); - text_p_ =0; + text_->set_object ("side-support-elements", + grob_list_to_grob_array (get_property ("stavesFound"))); + text_ = 0; } } - void Bar_number_engraver::create_items () { - if (text_p_) + if (text_) return; - SCM b = get_property ("basicBarNumberProperties"); - text_p_ = new Item (b); - Side_position::set_axis(text_p_,Y_AXIS); + text_ = make_item ("BarNumber", SCM_EOL); +} - 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)) - { - text_p_->set_elt_property ("padding", padding); - } - else - { - text_p_ - ->set_elt_property ("padding", - gh_double2scm(paper_l ()->get_var ("interline"))); - } +ADD_ACKNOWLEDGER (Bar_number_engraver, break_alignment); +ADD_TRANSLATOR (Bar_number_engraver, + /* doc */ + "A bar number is created whenever @code{measurePosition} is" + " zero and when there is a bar line (i.e., when" + " @code{whichBar} is set). It is put on top of all staves," + " and appears only at the left side of the staff. The staves" + " are taken from @code{stavesFound}, which is maintained by" + " @ref{Staff_collecting_engraver}.", - announce_element (text_p_, 0); -} + /* create */ + "BarNumber ", + + /* read */ + "currentBarNumber " + "whichBar " + "stavesFound " + "barNumberVisibility ", + /* write */ + "" + );