X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-number-engraver.cc;h=44f155df6e24298ca81a6f20c45b8b63904abd74;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=1715fde5ded9c9eb23640871695f339173dc95d2;hpb=02ad2d3bb642d9228c4ae69efc71a74bd222575f;p=lilypond.git diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index 1715fde5de..44f155df6e 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -1,45 +1,210 @@ /* - 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--2015 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 // for reverse + +#include "paper-column.hh" +#include "output-def.hh" +#include "side-position-interface.hh" +#include "engraver.hh" +#include "context.hh" +#include "grob-array.hh" +#include "stream-event.hh" -#include "bar-number-engraver.hh" -#include "timing-translator.hh" -#include "timing-engraver.hh" -#include "engraver-group-engraver.hh" -#include "text-item.hh" +#include "translator.icc" -Bar_number_engraver::Bar_number_engraver() +/* + 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 { - axis_ = Y_AXIS; - type_ = "barNumber"; -} +protected: + Item *text_; + int alternative_starting_bar_number_; + int alternative_number_; + int alternative_number_increment_; + Stream_event *alternative_event_; +protected: + void stop_translation_timestep (); + void listen_alternative (Stream_event *); + void acknowledge_break_alignment (Grob_info); + void process_music (); + void create_items (); + TRANSLATOR_DECLARATIONS (Bar_number_engraver); +}; + +void +Bar_number_engraver::listen_alternative (Stream_event *ev) +{ + if (alternative_event_) + return; + + alternative_event_ = ev; + int current_barnumber = robust_scm2int (get_property ("currentBarNumber"), 0); + Direction alternative_dir = robust_scm2dir (ev->get_property ("alternative-dir"), CENTER); + bool make_alternative = scm_is_eq (get_property ("alternativeNumberingStyle"), + ly_symbol2scm ("numbers")) + || scm_is_eq (get_property ("alternativeNumberingStyle"), + ly_symbol2scm ("numbers-with-letters")); + if (make_alternative) + { + /* + if we're starting the first alternative, we set the starting + bar number to the current bar number + */ + if (alternative_dir == LEFT) + alternative_starting_bar_number_ = current_barnumber; + /* + if the alternative is not the last one, we send the + current bar number back to the alternative bar number. + */ + if (alternative_dir < RIGHT) + current_barnumber = alternative_starting_bar_number_; + + context ()->set_property ("currentBarNumber", scm_from_int (current_barnumber)); + } +} void -Bar_number_engraver::do_process_requests () +Bar_number_engraver::process_music () { - Translator *tr = daddy_grav_l ()->get_simple_translator ("Timing_engraver"); - Timing_translator *time = dynamic_cast(tr); + SCM wb = get_property ("whichBar"); + + if (scm_is_string (wb)) + { + Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0))); + SCM bn = get_property ("currentBarNumber"); + SCM proc = get_property ("barNumberVisibility"); + if (scm_is_number (bn) && ly_is_procedure (proc) + && to_boolean (scm_call_2 (proc, bn, mp.smobbed_copy ()))) + { + create_items (); + SCM alternative_style = get_property ("alternativeNumberingStyle"); + string text_tag = ""; + if (scm_is_eq (alternative_style, ly_symbol2scm ("numbers-with-letters"))) + { + if (alternative_event_) + { + Direction alternative_dir = robust_scm2dir (alternative_event_->get_property ("alternative-dir"), RIGHT); + switch (alternative_dir) + { + case LEFT: + alternative_number_ = 0; + break; + case CENTER: + break; + case RIGHT: + alternative_number_ = INT_MIN; + break; + default: + assert (false); + } + alternative_number_ += alternative_number_increment_; - // todo include (&&!time->cadenza_b_ ) - SCM bn = get_property("currentBarNumber"); + alternative_number_increment_ = robust_scm2int (alternative_event_->get_property ("alternative-increment"), 1); + } + } + SCM formatter = get_property ("barNumberFormatter"); + if (ly_is_procedure (formatter)) + text_->set_property ("text", scm_call_4 (formatter, + bn, + mp.smobbed_copy (), + scm_from_int (alternative_number_), + context ()->self_scm ())); + } + } +} + +Bar_number_engraver::Bar_number_engraver (Context *c) + : Engraver (c) +{ + text_ = 0; + alternative_starting_bar_number_ = 0; + alternative_number_increment_ = 0; + alternative_number_ = INT_MIN; + alternative_event_ = 0; +} - if (gh_number_p (bn) && - !time->measure_position () && now_mom () > Moment (0)) +void +Bar_number_engraver::acknowledge_break_alignment (Grob_info inf) +{ + Grob *s = inf.grob (); + if (text_ + && dynamic_cast (s)) { - create_items (0); + text_->set_parent (s, X_AXIS); + } +} - // guh. - text_p_->set_elt_property ("text", - ly_str02scm (to_str (gh_scm2int (bn)).ch_C())); - +void +Bar_number_engraver::stop_translation_timestep () +{ + alternative_event_ = 0; + if (text_) + { + text_->set_object ("side-support-elements", + grob_list_to_grob_array (get_property ("stavesFound"))); + text_ = 0; } } -ADD_THIS_TRANSLATOR(Bar_number_engraver); +void +Bar_number_engraver::create_items () +{ + if (text_) + return; + + text_ = make_item ("BarNumber", SCM_EOL); +} + + +void +Bar_number_engraver::boot () +{ + ADD_LISTENER (Bar_number_engraver, alternative); + 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}.", + + /* create */ + "BarNumber ", + + /* read */ + "currentBarNumber " + "whichBar " + "stavesFound " + "barNumberFormatter " + "barNumberVisibility " + "alternativeNumberingStyle ", + + /* write */ + "currentBarNumber " + );