* lily/include/lily-guile-macros.hh: new file.

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

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index d9aa646a3b5bfd63ad8e7d0f86daffdf561b7681..7b54329835b87055c29eb8c9a8b6ba1c5b93b26a 100644 (file)
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -6,14 +6,11 @@
   (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 "engraver.hh"
 
-
 /** 
 
   Make bars that span multiple "staves". Catch bars, and span a
@@ -37,7 +34,7 @@ protected:
 
 Span_bar_engraver::Span_bar_engraver ()
 {
-  spanbar_ =0;
+  spanbar_ = 0;
 }
 
 void
@@ -51,10 +48,10 @@ Span_bar_engraver::acknowledge_grob (Grob_info i)
 
       if (bars_.size () >= 2 && !spanbar_) 
        {
-         spanbar_ = make_item ("SpanBar");
+         spanbar_ = make_item ("SpanBar", SCM_EOL);
 
          spanbar_->set_parent (bars_[0], X_AXIS);
-         announce_grob (spanbar_, SCM_EOL);
+         
        }
     }
 }
@@ -64,22 +61,22 @@ Span_bar_engraver::stop_translation_timestep ()
 {
   if (spanbar_) 
     {
-      for (int i=0; i < bars_.size () ; i++)
+      for (int i = 0; i < bars_.size () ; i++)
        Span_bar::add_bar (spanbar_,bars_[i]);
 
-      SCM vissym =ly_symbol2scm ("break-visibility");
+      SCM vissym = ly_symbol2scm ("break-visibility");
       SCM vis = bars_[0]->internal_get_property (vissym);        
-      if (ly_equal_p (spanbar_->internal_get_property (vissym), vis))
+      if (ly_c_equal_p (spanbar_->internal_get_property (vissym), vis))
        spanbar_->internal_set_property (vissym, vis);
 
-      typeset_grob (spanbar_);
-      spanbar_ =0;
+      
+      spanbar_ = 0;
     }
   bars_.set_size (0);
 }
 
 
-ENTER_DESCRIPTION (Span_bar_engraver,
+ADD_TRANSLATOR (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",