patch::: 1.3.54.hwn2

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

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index acf9c4fb06a21ada1a4c1b7c277099c71e641d11..5a3e29b9685a12cdfbdd0131539a7055f44cb1cf 100644 (file)
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -3,72 +3,71 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "dimension-cache.hh"
+#include "lily-guile.hh"
 #include "span-bar.hh"
-#include "span-bar-engraver.hh"
-#include "vertical-align-spanner.hh"
+#include "engraver.hh"
+
+/** 
+
+  Make bars that span multiple "staffs". Catch bars, and span a
+  Span_bar over them if we find more than 2 bars.  Vertical alignment
+  of staffs changes the appearance of spanbars.  It is up to the
+  aligner (Vertical_align_engraver, in this case, to add extra
+  dependencies to the spanbars.
+
+  */
+class Span_bar_engraver : public Engraver
+{
+  Span_bar * spanbar_p_;
+  Link_array<Bar> bar_l_arr_;
+
+public:
+  VIRTUAL_COPY_CONS(Translator);
+  Span_bar_engraver();
+protected:
+  virtual void acknowledge_element (Score_element_info);
+  virtual void do_pre_move_processing();
+  virtual Span_bar* get_span_bar_p() const;
+};
+
 
 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;
+  Span_bar * sp= new Span_bar;
+  return sp;
 }
 
 
-void
-Span_bar_engraver::do_creation_processing ()
-{
-}
-
-void
-Span_bar_engraver::do_removal_processing ()
-{
-}    
-
 void
 Span_bar_engraver::acknowledge_element (Score_element_info i)
 {
-  int depth = i.origin_grav_l_arr_.size();
+  int depth = i.origin_trans_l_arr (this).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
-       */
-
-       /*
-
-         use a property?  get_property ("singleStaffBracket") ?
 
-         --hwn
-        */
+      if (bar_l_arr_.size() >= 2 && !spanbar_p_) 
        {
          spanbar_p_ = get_span_bar_p();
+         spanbar_p_-> property_alist_ = bar_l_arr_[0]->property_alist_;
+         spanbar_p_->set_parent (bar_l_arr_[0], Y_AXIS);
+         spanbar_p_->set_parent (bar_l_arr_[0], X_AXIS);
+
          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()
 {
@@ -76,7 +75,6 @@ Span_bar_engraver::do_pre_move_processing()
     {
       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;
     }
@@ -84,5 +82,8 @@ Span_bar_engraver::do_pre_move_processing()
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Span_bar_engraver,Engraver);
+
 ADD_THIS_TRANSLATOR(Span_bar_engraver);
+
+
+