release: 1.1.51

[lilypond.git] / lily / bar-engraver.cc

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index e7bdb019ac596ecea219ee8252c3a6f646eb7c8b..04eca124294c70aba9497db0b6e3ce39a698fb5f 100644 (file)
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -8,13 +8,12 @@
 */
 
 #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()
 {
@@ -38,33 +37,30 @@ Bar_engraver::do_try_music (Music*r_l)
 
 }
 
-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_->at_line_start_b_ = true;
+         bar_p_->set_elt_property (at_line_start_scm_sym, SCM_BOOL_T);
        }
       announce_element (Score_element_info (bar_p_, bar_req_l_));
     }