*/
#include "bar-engraver.hh"
-#include "bar.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.hh"
-#include "repeated-music.hh"
+#include "engraver-group-engraver.hh"
Bar_engraver::Bar_engraver()
{
}
-void
-Bar_engraver::acknowledge_element (Score_element_info i)
-{
- if (Bar *b = dynamic_cast<Bar *> (i.elem_l_))
- {
- // only bar-engraver should create bars
- assert (0);
- }
-}
+
void
Bar_engraver::create_bar ()
{
if (!bar_p_)
{
- bar_p_ = new Bar;
- bar_p_->break_priority_i_ = 0;
+ 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);
+ }
announce_element (Score_element_info (bar_p_, bar_req_l_));
}
}
void
Bar_engraver::request_bar (String type_str)
{
+ Scalar prop = get_property ("barAtLineStart", 0);
+ if (!now_mom ())
+ {
+ Scalar prop = get_property ("barAtLineStart", 0);
+ if (!prop.to_bool ())
+ return;
+ }
create_bar ();
if (((type_str == "|:") && (bar_p_->type_str_ == ":|"))
|| ((type_str == ":|") && (bar_p_->type_str_ == "|:")))
{
create_bar ();
bar_p_->type_str_ = "";
- Scalar prop = get_property ("barAuto", 0);
- auto_create_bar_b_ = prop.to_bool ();
}
void
create_bar ();
bar_p_->type_str_ = bar_req_l_->type_str_;
}
- else if (!now_moment ())
+ else if (!now_mom ())
{
create_bar ();
- bar_p_->type_str_ = "";
+ bar_p_->type_str_ = "|";
}
else
{
- Scalar always = get_property ("barAlways", 0);
- if ((time && !time->whole_in_measure_) || always.to_bool ())
+ Scalar nonauto = get_property ("barNonAuto", 0);
+ if (!nonauto.to_bool ())
{
- if (auto_create_bar_b_)
+ Scalar always = get_property ("barAlways", 0);
+ if ((time && !time->whole_in_measure_) || always.to_bool ())
create_bar ();
- Scalar prop = get_property ("barAuto", 0);
- auto_create_bar_b_ = prop.to_bool ();
}
}