partial: 1.0.1.jcn

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

diff --git a/lily/bar-column-grav.cc b/lily/bar-column-grav.cc
index 8ab52f41d5a73ada4b8a4b2d41f8ec2b648ecdd7..7afced803a8a5759e49ecc07224f2b1e8fbed196 100644 (file)
--- a/lily/bar-column-grav.cc
+++ b/lily/bar-column-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
 
@@ -29,18 +29,17 @@ Bar_column_engraver::acknowledge_element (Score_elem_info info)
     {
       script_l_arr_.push ((Script*)info.elem_l_->item());
     }
-  else 
-    {
-      if  (info.origin_grav_l_arr_.size() == 1 
-          && info.elem_l_->is_type_b (Bar::static_name()))
-       bar_l_ = (Bar*)info.elem_l_->item();
-    }
+  else if  (info.origin_grav_l_arr_.size() == 1 
+           && info.elem_l_->is_type_b (Bar::static_name()))
+    bar_l_ = (Bar*)info.elem_l_->item();
        
   if (bar_l_ && !barcol_p_) 
     {
       barcol_p_ = new Bar_column;
       barcol_p_->breakable_b_ =true;
+      barcol_p_->break_priority_i_ = bar_l_ -> break_priority_i_;
       barcol_p_->set_bar (bar_l_);
+      
       announce_element (Score_elem_info (barcol_p_, 0));
     }
 
@@ -49,6 +48,7 @@ Bar_column_engraver::acknowledge_element (Score_elem_info info)
       for (int i=0; i < script_l_arr_.size(); i++) 
        {
          script_l_arr_[i]->breakable_b_ = true;
+         script_l_arr_[i]->break_priority_i_ = barcol_p_-> break_priority_i_;
          barcol_p_->add (script_l_arr_[i]);
        }
       script_l_arr_.clear();