From: fred <fred>
Date: Sun, 24 Mar 2002 20:03:36 +0000 (+0000)
Subject: lilypond-0.1.36
X-Git-Tag: release/1.5.59~3554
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b300cd5a63f0390a9d25c26e95a807b15520f52b;p=lilypond.git

lilypond-0.1.36
---

diff --git a/lily/bar-grav.cc b/lily/bar-grav.cc
index 16631e5221..2d43282523 100644
--- a/lily/bar-grav.cc
+++ b/lily/bar-grav.cc
@@ -7,7 +7,7 @@
 */
 
 #include "bar-grav.hh"
-#include "normal-bar.hh"
+#include "bar.hh"
 #include "command-request.hh"
 #include "time-description.hh"
 #include "engraver-group.hh"
@@ -32,6 +32,17 @@ Bar_engraver::do_try_request (Request*r_l)
   return true;
 }
 
+void
+Bar_engraver::create_bar ()
+{
+  if (!bar_p_)
+    {
+      bar_p_ = new Bar;
+      bar_p_->break_priority_i_  = 0;
+      announce_element (Score_elem_info (bar_p_, bar_req_l_));
+    }
+}
+
 void
 Bar_engraver::do_process_requests()
 {
@@ -40,21 +51,17 @@ Bar_engraver::do_process_requests()
   
   if (bar_req_l_) 
     {
-      bar_p_ = new Normal_bar;
+      create_bar ();
       bar_p_->type_str_=bar_req_l_->type_str_;
     }
   else 
     {
       Time_description const *time = get_staff_info().time_C_;
       if (time && !time->whole_in_measure_) 
- 	bar_p_ = new Normal_bar;
+ 	create_bar ();
     }
   
-  if (bar_p_)
-    {
-      announce_element (Score_elem_info (bar_p_, bar_req_l_));
-    }
-  else 
+  if (!bar_p_)
     {
       Disallow_break_req r;
       daddy_grav_l()->try_request (&r);
diff --git a/lily/span-bar-grav.cc b/lily/span-bar-grav.cc
index ea05d68fcd..8d9cffdff3 100644
--- a/lily/span-bar-grav.cc
+++ b/lily/span-bar-grav.cc
@@ -6,7 +6,7 @@
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
-#include "normal-span-bar.hh"
+#include "span-bar.hh"
 #include "span-bar-grav.hh"
 #include "vertical-align-spanner.hh"
 
@@ -19,7 +19,7 @@ Span_bar_engraver::Span_bar_engraver()
 Span_bar*
 Span_bar_engraver::get_span_bar_p() const
 {
-  return new Normal_span_bar;
+  return new Span_bar;
 }
 
 void