2003 -> 2004

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

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index a4e19592d0a468007f8db55ac7cf50c422a29aa5..0738451478e05603963c73c4513fc3c49bc716b1 100644 (file)
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -3,12 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #include "lily-guile.hh"
-#include "bar.hh"
+#include "bar-line.hh"
 #include "item.hh"
 #include "span-bar.hh"
 #include "engraver.hh"
@@ -16,21 +16,20 @@
 
 /** 
 
-  Make bars that span multiple "staffs". Catch bars, and span a
+  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 staffs changes the appearance of spanbars.  It is up to the
+  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
 {
-  Item * spanbar_p_;
-  Link_array<Item> bar_l_arr_;
+  Item * spanbar_;
+  Link_array<Item> bars_;
 
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  Span_bar_engraver ();
+  TRANSLATOR_DECLARATIONS(Span_bar_engraver);
 protected:
   virtual void acknowledge_grob (Grob_info);
   virtual void stop_translation_timestep ();
@@ -40,7 +39,7 @@ protected:
 
 Span_bar_engraver::Span_bar_engraver ()
 {
-  spanbar_p_ =0;
+  spanbar_ =0;
 }
 
 
@@ -48,47 +47,53 @@ Span_bar_engraver::Span_bar_engraver ()
 void
 Span_bar_engraver::acknowledge_grob (Grob_info i)
 {
-  int depth = i.origin_trans_l_arr (this).size ();
+  int depth = i.origin_transes (this).size ();
   if (depth > 1
-      && Bar::has_interface (i.elem_l_))
+      && Bar_line::has_interface (i.grob_))
     {
-      Item * it = dynamic_cast<Item*> (i.elem_l_);
-      bar_l_arr_.push (it);
+      Item * it = dynamic_cast<Item*> (i.grob_);
+      bars_.push (it);
 
-      if (bar_l_arr_.size () >= 2 && !spanbar_p_) 
+      if (bars_.size () >= 2 && !spanbar_) 
        {
-         spanbar_p_ = new Item (get_property ("SpanBar"));
-         Span_bar::set_interface (spanbar_p_);
-               
-         spanbar_p_->set_parent (bar_l_arr_[0], Y_AXIS);
-         spanbar_p_->set_parent (bar_l_arr_[0], X_AXIS);
+         spanbar_ = make_item ("SpanBar");
 
-         announce_grob (spanbar_p_,0);
+         spanbar_->set_parent (bars_[0], X_AXIS);
+
+         announce_grob (spanbar_, SCM_EOL);
        }
     }
 }
 void
 Span_bar_engraver::stop_translation_timestep ()
 {
-  if (spanbar_p_) 
+  if (spanbar_) 
     {
-      for (int i=0; i < bar_l_arr_.size () ; i++)
-       Span_bar::add_bar (spanbar_p_,bar_l_arr_[i]);
+      for (int i=0; i < bars_.size () ; i++)
+       Span_bar::add_bar (spanbar_,bars_[i]);
 
-      SCM vissym =ly_symbol2scm ("visibility-lambda");
-      SCM vis = bar_l_arr_[0]->get_grob_property (vissym);       
-      if (scm_equal_p (spanbar_p_->get_grob_property (vissym), vis) != SCM_BOOL_T)
-       spanbar_p_->set_grob_property (vissym, vis);
+      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_p_);
-      spanbar_p_ =0;
+      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 */       "");