/*
- bar-reg.cc -- implement Bar_engraver
+ bar-engraver.cc -- implement Bar_engraver
source file of the GNU LilyPond music typesetter
- (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997, 1998, 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ Jan Nieuwenhuizen <janneke@gnu.org>
*/
#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 "engraver-group-engraver.hh"
Bar_engraver::Bar_engraver()
{
}
bool
-Bar_engraver::do_try_request (Request*r_l)
+Bar_engraver::do_try_music (Music*r_l)
{
- Command_req* c_l = dynamic_cast <Command_req *> (r_l);
- if (!c_l|| !dynamic_cast <Bar_req *> (c_l))
- return false;
- Bar_req * b= dynamic_cast <Bar_req *> (c_l);
- if (bar_req_l_ && bar_req_l_->equal_b (b))
- return false;
+ if (Bar_req * b= dynamic_cast <Bar_req *> (r_l))
+ {
+ if (bar_req_l_ && bar_req_l_->equal_b (b)) // huh?
+ return false;
+
+ bar_req_l_ = b;
+ return true;
+ }
- bar_req_l_ = b;
+ return false;
- return true;
}
+
+
void
Bar_engraver::create_bar ()
{
if (!bar_p_)
{
- bar_p_ = new Bar;
- bar_p_->break_priority_i_ = 0;
- String default_type = get_property ("defaultBarType");
+ 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_ == "|:")))
+ bar_p_->type_str_ = ":|:";
+ else
+ bar_p_->type_str_ = type_str;
+}
void
Bar_engraver::do_creation_processing ()
void
Bar_engraver::do_process_requests()
{
+ Time_description const *time = get_staff_info().time_C_;
if (bar_req_l_)
{
- if (!bar_p_)
- create_bar ();
-
+ create_bar ();
bar_p_->type_str_ = bar_req_l_->type_str_;
}
+ else if (!now_mom ())
+ {
+ create_bar ();
+ bar_p_->type_str_ = "|";
+ }
else
{
- Time_description const *time = get_staff_info().time_C_;
- String always = get_property ("barAlways");
- if ((time && !time->whole_in_measure_) || always.length_i ())
- create_bar ();
+ 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_)
{
Break_req r;
r.penalty_i_ = Break_req::DISALLOW;
- daddy_grav_l ()->try_request (&r);
+ daddy_grav_l ()->try_music (&r);
}
}
}
-IMPLEMENT_IS_TYPE_B1(Bar_engraver,Engraver);
+
ADD_THIS_TRANSLATOR(Bar_engraver);