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 ac3e868a522f62d3af3bf9b895348f883c116668..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>
 */
 
 
@@ -24,34 +24,34 @@ void
 Bar_column_engraver::acknowledge_element (Score_elem_info info)
 {
   if (info.elem_l_->is_type_b (Script::static_name()) 
-       && info.req_l_->command()
-       && info.origin_grav_l_arr_.size() == 1) 
-         {
-       script_l_arr_.push ((Script*)info.elem_l_->item());
-    }
-  else 
+      && info.req_l_->command()
+      && info.origin_grav_l_arr_.size() == 1) 
     {
-       if  (info.origin_grav_l_arr_.size() == 1 
-            && info.elem_l_->is_type_b (Bar::static_name()))
-            bar_l_ = (Bar*)info.elem_l_->item();
+      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();
        
   if (bar_l_ && !barcol_p_) 
     {
-       barcol_p_ = new Bar_column;
-       barcol_p_->breakable_b_ =true;
-       barcol_p_->set_bar (bar_l_);
-       announce_element (Score_elem_info (barcol_p_, 0));
+      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));
     }
 
   if  (barcol_p_) 
     {
-       for (int i=0; i < script_l_arr_.size(); i++) 
-         {
-           script_l_arr_[i]->breakable_b_ = true;
-           barcol_p_->add (script_l_arr_[i]);
-         }
-       script_l_arr_.clear();
+      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();
     }
 }
 
@@ -60,8 +60,8 @@ Bar_column_engraver::do_pre_move_processing()
 {
   if (barcol_p_) 
     {
-       typeset_element (barcol_p_);
-       barcol_p_ =0;
+      typeset_element (barcol_p_);
+      barcol_p_ =0;
     }
 }
 
@@ -73,4 +73,4 @@ Bar_column_engraver::do_post_move_processing()
 }
 
 IMPLEMENT_IS_TYPE_B1(Bar_column_engraver, Engraver);
-ADD_THIS_ENGRAVER(Bar_column_engraver);
+ADD_THIS_TRANSLATOR(Bar_column_engraver);