release: 1.1.28

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

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index 0e1e00841faa12bd8b3f890f2e5add9b2b915034..3848b84164daa58e39762735a6b7dfe312d3128e 100644 (file)
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -1,88 +1,19 @@
-/*
-  span-bar-grav.cc -- implement Span_bar_engraver
+#include "base-span-bar-engraver.hh"
 
-  source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-#include "span-bar.hh"
-#include "span-bar-engraver.hh"
-#include "vertical-align-spanner.hh"
-
-Span_bar_engraver::Span_bar_engraver()
-{
-  spanbar_p_ =0;
-  valign_l_ =0;
-}
-
-Span_bar*
-Span_bar_engraver::get_span_bar_p() const
-{
-  return new Span_bar;
-}
-
-
-void
-Span_bar_engraver::do_creation_processing ()
-{
-}
-
-void
-Span_bar_engraver::do_removal_processing ()
+class Span_bar_engraver : public Base_span_bar_engraver
 {
-}    
-
-void
-Span_bar_engraver::acknowledge_element (Score_element_info i)
-{
-  int depth = i.origin_grav_l_arr_.size();
-  if (depth > 1
-      && dynamic_cast<Bar *> (i.elem_l_)) 
-    {
-      bar_l_arr_.push (dynamic_cast<Bar *> (i.elem_l_));
-       
-      if (bar_l_arr_.size() >= 2 && !spanbar_p_) 
-       /*
-         hmm, i do want a bracket with one staff some times, but not always
-         if (bar_l_arr_.size() >= 1 && !spanbar_p_)
-
-         --jcn
-       */
+protected:
+  Span_bar *get_span_bar_p ();
+public:
+  Span_bar_engraver ();
+  VIRTUAL_COPY_CONS (Translator);
+};
 
-       /*
 
-         use a property?  get_property ("singleStaffBracket", 0) ?
-
-         --hwn
-        */
-       {
-         spanbar_p_ = get_span_bar_p();
-         announce_element (Score_element_info (spanbar_p_,0));
-         spanbar_p_-> type_str_ = bar_l_arr_[0]->type_str_;
-       }
-    }
-  else if  (dynamic_cast<Vertical_align_spanner *> (i.elem_l_) 
-           && i.origin_grav_l_arr_.size() <= 2) 
-    {
-      valign_l_ = dynamic_cast<Vertical_align_spanner *> (i.elem_l_);
-    }
-}
-
-void
-Span_bar_engraver::do_pre_move_processing()
+Span_bar_engraver::Span_bar_engraver ()
 {
-  if (spanbar_p_) 
-    {
-      for (int i=0; i < bar_l_arr_.size() ; i++)
-       spanbar_p_->add_bar (bar_l_arr_[i]);
-      spanbar_p_->set_align (valign_l_);
-      typeset_element (spanbar_p_);
-      spanbar_p_ =0;
-    }
-  bar_l_arr_.set_size (0);
+  use_priority_b_ = false;
 }
 
-
-
 ADD_THIS_TRANSLATOR(Span_bar_engraver);