release: 0.1.11

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

diff --git a/lily/bar-grav.cc b/lily/bar-grav.cc
index c390c78a31420cc04586cead10e5d28d5a6b6fc2..c11a7debeefae3b31455c16f560465bd6e006f94 100644 (file)
--- a/lily/bar-grav.cc
+++ b/lily/bar-grav.cc
@@ -22,10 +22,10 @@ Bar_engraver::do_try_request (Request*r_l)
 {
   Command_req* c_l = r_l->command();
   if (!c_l|| !c_l->bar()) 
-       return false;
+    return false;
   Bar_req  * b= c_l->bar();
   if (bar_req_l_ && bar_req_l_->equal_b (b))
-       return false;
+    return false;
   
   bar_req_l_ = b;
 
@@ -37,22 +37,24 @@ Bar_engraver::do_process_requests()
 {
   if (bar_req_l_) 
     {
-       bar_p_ = new Bar;
-       bar_p_->type_str_=bar_req_l_->type_str_;
+      bar_p_ = new Bar;
+      bar_p_->type_str_=bar_req_l_->type_str_;
     }
-  else if (!get_staff_info().time_C_->whole_in_measure_) 
+  else 
     {
+      Time_description const *time = get_staff_info().time_C_;
+      if (time && !time->whole_in_measure_) 
        bar_p_ = new Bar;
     }
   
   if (bar_p_)
     {
-       announce_element (Score_elem_info (bar_p_, bar_req_l_));
+      announce_element (Score_elem_info (bar_p_, bar_req_l_));
     }
   else 
     {
-       Disallow_break_req r;
-       daddy_grav_l_->try_request (&r);
+      Disallow_break_req r;
+      daddy_grav_l_->try_request (&r);
     }
 }
 
@@ -60,11 +62,11 @@ Bar_engraver::do_process_requests()
 void 
 Bar_engraver::do_pre_move_processing()
 {
-    if (bar_p_) 
-      {
-         typeset_element (bar_p_);
-         bar_p_ =0;
-      }
+  if (bar_p_) 
+    {
+      typeset_element (bar_p_);
+      bar_p_ =0;
+    }
 }
 
 void