partial: 0.1.61.jcn

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

diff --git a/lily/span-bar-grav.cc b/lily/span-bar-grav.cc
index a6d40fdd9c69bea88f13e90510a6c3dc95b57f1f..727fe56c76771a82717ca582c911aa1378bffe48 100644 (file)
--- a/lily/span-bar-grav.cc
+++ b/lily/span-bar-grav.cc
@@ -12,47 +12,64 @@
 
 Span_bar_engraver::Span_bar_engraver()
 {
-    spanbar_p_ =0;
-    valign_l_ =0;
+  spanbar_p_ =0;
+  valign_l_ =0;
 }
 
 Span_bar*
-Span_bar_engraver::get_span_bar_p()const
+Span_bar_engraver::get_span_bar_p() const
+{
+  return new Span_bar;
+}
+
+
+void
+Span_bar_engraver::do_creation_processing ()
 {
-    return  new Span_bar;
 }
 
 void
-Span_bar_engraver::acknowledge_element(Score_elem_info i)
+Span_bar_engraver::do_removal_processing ()
 {
-    if ( i.origin_grav_l_arr_.size() > 1 && 
-        i.elem_l_->is_type_b( Bar::static_name() ) ) {
-       bar_l_arr_.push( (Bar*)i.elem_l_->item() );
+}    
+
+void
+Span_bar_engraver::acknowledge_element (Score_elem_info i)
+{
+  int depth = i.origin_grav_l_arr_.size();
+  if (depth > 1
+      && i.elem_l_->is_type_b (Bar::static_name())) 
+    {
+      bar_l_arr_.push ((Bar*)i.elem_l_->item());
        
-       if (bar_l_arr_.size() >= 2 && !spanbar_p_) {
-           spanbar_p_ = get_span_bar_p();
-           announce_element( Score_elem_info(spanbar_p_,0) );
+      if (bar_l_arr_.size() >= 2 && !spanbar_p_) 
+       {
+         spanbar_p_ = get_span_bar_p();
+         announce_element (Score_elem_info (spanbar_p_,0));
+         spanbar_p_-> type_str_ = bar_l_arr_[0]->type_str_;
        }
-    } else if  (i.elem_l_->is_type_b( Vertical_align_spanner::static_name() ) 
-               && i.origin_grav_l_arr_.size() <= 2) {
-       valign_l_ = (Vertical_align_spanner*)i.elem_l_->spanner();
+    }
+  else if  (i.elem_l_->is_type_b (Vertical_align_spanner::static_name()) 
+           && i.origin_grav_l_arr_.size() <= 2) 
+    {
+      valign_l_ = (Vertical_align_spanner*)i.elem_l_->spanner();
     }
 }
 
 void
 Span_bar_engraver::do_pre_move_processing()
 {
-    if (spanbar_p_) {
-       for (int i=0; i < bar_l_arr_.size() ; i++)
-           spanbar_p_->add(bar_l_arr_[i]);
-       spanbar_p_->set( valign_l_ );
-       typeset_breakable_item(spanbar_p_);
-       spanbar_p_ =0;
+  if (spanbar_p_) 
+    {
+      for (int i=0; i < bar_l_arr_.size() ; i++)
+       spanbar_p_->add (bar_l_arr_[i]);
+      spanbar_p_->set (valign_l_);
+      typeset_element (spanbar_p_);
+      spanbar_p_ =0;
     }
-    bar_l_arr_.set_size( 0);
-       
+  bar_l_arr_.set_size (0);
 }
 
 
 IMPLEMENT_IS_TYPE_B1(Span_bar_engraver,Engraver);
-ADD_THIS_ENGRAVER(Span_bar_engraver);
+ADD_THIS_TRANSLATOR(Span_bar_engraver);