2003 -> 2004

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

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index 0e1e00841faa12bd8b3f890f2e5add9b2b915034..0738451478e05603963c73c4513fc3c49bc716b1 100644 (file)
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -3,86 +3,97 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+
+#include "lily-guile.hh"
+#include "bar-line.hh"
+#include "item.hh"
 #include "span-bar.hh"
-#include "span-bar-engraver.hh"
-#include "vertical-align-spanner.hh"
+#include "engraver.hh"
 
-Span_bar_engraver::Span_bar_engraver()
-{
-  spanbar_p_ =0;
-  valign_l_ =0;
-}
 
-Span_bar*
-Span_bar_engraver::get_span_bar_p() const
+/** 
+
+  Make bars that span multiple "staves". Catch bars, and span a
+  Span_bar over them if we find more than 2 bars.  Vertical alignment
+  of staves 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
 {
-  return new Span_bar;
-}
+  Item * spanbar_;
+  Link_array<Item> bars_;
 
+public:
+  TRANSLATOR_DECLARATIONS(Span_bar_engraver);
+protected:
+  virtual void acknowledge_grob (Grob_info);
+  virtual void stop_translation_timestep ();
 
-void
-Span_bar_engraver::do_creation_processing ()
+};
+
+
+Span_bar_engraver::Span_bar_engraver ()
 {
+  spanbar_ =0;
 }
 
-void
-Span_bar_engraver::do_removal_processing ()
-{
-}    
+
 
 void
-Span_bar_engraver::acknowledge_element (Score_element_info i)
+Span_bar_engraver::acknowledge_grob (Grob_info i)
 {
-  int depth = i.origin_grav_l_arr_.size();
+  int depth = i.origin_transes (this).size ();
   if (depth > 1
-      && dynamic_cast<Bar *> (i.elem_l_)) 
+      && Bar_line::has_interface (i.grob_))
     {
-      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_)
+      Item * it = dynamic_cast<Item*> (i.grob_);
+      bars_.push (it);
 
-         --jcn
-       */
-
-       /*
+      if (bars_.size () >= 2 && !spanbar_) 
+       {
+         spanbar_ = make_item ("SpanBar");
 
-         use a property?  get_property ("singleStaffBracket", 0) ?
+         spanbar_->set_parent (bars_[0], X_AXIS);
 
-         --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_;
+         announce_grob (spanbar_, SCM_EOL);
        }
     }
-  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::stop_translation_timestep ()
 {
-  if (spanbar_p_) 
+  if (spanbar_) 
     {
-      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;
+      for (int i=0; i < bars_.size () ; i++)
+       Span_bar::add_bar (spanbar_,bars_[i]);
+
+      SCM vissym =ly_symbol2scm ("break-visibility");
+      SCM vis = bars_[0]->internal_get_grob_property (vissym);   
+      if (scm_equal_p (spanbar_->internal_get_grob_property (vissym), vis) != SCM_BOOL_T)
+       spanbar_->internal_set_grob_property (vissym, vis);
+
+      typeset_grob (spanbar_);
+      spanbar_ =0;
     }
-  bar_l_arr_.set_size (0);
+  bars_.set_size (0);
 }
 
 
 
-ADD_THIS_TRANSLATOR(Span_bar_engraver);
+
+
+
+
+ENTER_DESCRIPTION(Span_bar_engraver,
+/* descr */       "This engraver makes cross-staff barlines: It catches all normal "
+"bar lines, and draws a single span-bar across them.",
+/* creats*/       "SpanBar",
+/* accepts */     "",
+/* acks  */      "bar-line-interface",
+/* reads */       "",
+/* write */       "");