X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-engraver.cc;h=cf217be3b08efbb2baa9e5b949d361f9c38f00a6;hb=9e484cffc04d14eab77cb8fd8ead727892310b60;hp=2d48eb6c4a3e5e1fa00c169ca67a8f8b19cc8a5e;hpb=78ed9c22a8cbf56ff5390553e0a2854aa42cbbc5;p=lilypond.git diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc index 2d48eb6c4a..cf217be3b0 100644 --- a/lily/bar-engraver.cc +++ b/lily/bar-engraver.cc @@ -1,178 +1,129 @@ /* - bar-engraver.cc -- implement Bar_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter - - (c) 1997, 1998, 1999 Han-Wen Nienhuys + Copyright (C) 1997--2012 Han-Wen Nienhuys 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 "context.hh" #include "score-engraver.hh" -#include "bar-engraver.hh" -#include "staff-bar.hh" -#include "musical-request.hh" -#include "multi-measure-rest.hh" -#include "command-request.hh" -#include "time-description.hh" -#include "engraver-group-engraver.hh" #include "warn.hh" +#include "item.hh" +#include "spanner.hh" -Bar_engraver::Bar_engraver() -{ - bar_p_ =0; - do_post_move_processing(); -} +#include "translator.icc" -bool -Bar_engraver::do_try_music (Music*r_l) +/* + generate bars. Either user ("|:"), or default (new measure) +*/ +class Bar_engraver : public Engraver { - if (Bar_req * b= dynamic_cast (r_l)) - { - if (bar_req_l_ && bar_req_l_->equal_b (b)) // huh? - return false; - - bar_req_l_ = b; - return true; - } - - return false; -} +public: + TRANSLATOR_DECLARATIONS (Bar_engraver); +protected: + void stop_translation_timestep (); + void process_acknowledged (); + DECLARE_END_ACKNOWLEDGER (spanner); -void -Bar_engraver::create_bar () +private: + void create_bar (); + + Item *bar_; + vector spanners_; +}; + +Bar_engraver::Bar_engraver () { - if (!bar_p_) - { - bar_p_ = new Staff_bar; - bar_p_->set_elt_property (break_priority_scm_sym, gh_int2scm (0)); - - // urg: "" != empty... - String default_type = get_property ("defaultBarType", 0); - if (default_type.length_i ()) - { - bar_p_->type_str_ = default_type; - } - - /* - urg. Why did I implement this? - */ - Scalar prop = get_property ("barAtLineStart", 0); - if (prop.to_bool ()) - { - bar_p_->set_elt_property (at_line_start_scm_sym, SCM_BOOL_T); - } - prop = get_property ("barSize", 0); - if (prop.isnum_b ()) - { - bar_p_->set_elt_property (bar_size_scm_sym, - gh_double2scm (Real(prop))); - } - announce_element (Score_element_info (bar_p_, bar_req_l_)); - } + bar_ = 0; } -/** - Make a barline. If there are both |: and :| requested, merge them - to :|: - -*/ void -Bar_engraver::request_bar (String type_str) +Bar_engraver::create_bar () { - Scalar prop = get_property ("barAtLineStart", 0); - if (!now_mom ()) + if (!bar_) { - Scalar prop = get_property ("barAtLineStart", 0); - if (!prop.to_bool ()) - return; + bar_ = make_item ("BarLine", SCM_EOL); + SCM gl = get_property ("whichBar"); + if (scm_equal_p (gl, bar_->get_property ("glyph")) != SCM_BOOL_T) + bar_->set_property ("glyph", gl); } - create_bar (); - - if (((type_str == "|:") && (bar_p_->type_str_ == ":|")) - || ((type_str == ":|") && (bar_p_->type_str_ == "|:"))) - bar_p_->type_str_ = ":|:"; - else if (type_str_.length_i ()) - bar_p_->type_str_ = type_str; } -void -Bar_engraver::do_creation_processing () -{ - create_bar (); - bar_p_->type_str_ = ""; -} +/* + Bar_engraver should come *after* any engravers that + modify whichBar + + This is a little hairy : whichBar may be set by + Repeat_acknowledge_engraver::process_music, which is at score + context. This means that grobs could should be created after + process_music. We do stuff process_acknowledged (), just to be + on the safe side. +*/ void -Bar_engraver::do_removal_processing () +Bar_engraver::process_acknowledged () { - if (bar_p_) - { - typeset_element (bar_p_); - bar_p_ =0; - } -} + if (!bar_ && scm_is_string (get_property ("whichBar"))) + create_bar (); -void -Bar_engraver::do_process_requests() -{ - Time_description const *time = get_staff_info().time_C_; - if (bar_req_l_) - { - create_bar (); - bar_p_->type_str_ = bar_req_l_->type_str_; - } - else if (!now_mom ()) - { - create_bar (); - bar_p_->type_str_ = "|"; - } - else - { - Scalar nonauto = get_property ("barNonAuto", 0); - if (!nonauto.to_bool ()) - { - Scalar always = get_property ("barAlways", 0); - if ((time && !time->whole_in_measure_) || always.to_bool ()) - create_bar (); - } - } - - if (!bar_p_) - { - Score_engraver * e = 0; - Translator * t = daddy_grav_l (); - for (; !e && t; t = t->daddy_trans_l_) - { - e = dynamic_cast (t); - } - - if (!e) - programming_error ("No score engraver!"); - else - e->forbid_breaks (); - } + if (bar_) + for (vsize i = 0; i < spanners_.size (); i++) + spanners_[i]->set_bound (RIGHT, bar_); } - -void -Bar_engraver::do_pre_move_processing() +/* + lines may only be broken if there is a barline in all staves +*/ +void +Bar_engraver::stop_translation_timestep () { - if (bar_p_) - { - typeset_element (bar_p_); - bar_p_ =0; - } + if (!bar_) + context ()->get_score_context ()->set_property ("forbidBreak", SCM_BOOL_T); + + bar_ = 0; + spanners_.clear (); } void -Bar_engraver::do_post_move_processing() +Bar_engraver::acknowledge_end_spanner (Grob_info gi) { - bar_req_l_ = 0; + Grob *g = gi.grob (); + + if (to_boolean (g->get_property ("to-barline"))) + spanners_.push_back (dynamic_cast (g)); } +ADD_END_ACKNOWLEDGER (Bar_engraver, spanner); +ADD_TRANSLATOR (Bar_engraver, + /* doc */ + "Create barlines. This engraver is controlled through the" + " @code{whichBar} property. If it has no bar line to create," + " it will forbid a linebreak at this point. This engraver" + " is required to trigger the creation of clefs at the start" + " of systems.", -ADD_THIS_TRANSLATOR(Bar_engraver); + /* create */ + "BarLine ", + /* read */ + "whichBar ", + /* write */ + "forbidBreak " + );