* lily/lookup.cc (triangle): rewrite, obviating symmetric_x_triangle().

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

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index c8d0b1527a1dd5dc66f4b1c6ad5388e0684a9c96..3016528658f961e5636a024602184c5dc9fdc3a5 100644 (file)
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -25,25 +25,21 @@
   */
 class Span_bar_engraver : public Engraver
 {
-  Item * spanbar_;
+  Item *spanbar_;
   Link_array<Item> bars_;
 
 public:
-  TRANSLATOR_DECLARATIONS(Span_bar_engraver);
+  TRANSLATOR_DECLARATIONS (Span_bar_engraver);
 protected:
   virtual void acknowledge_grob (Grob_info);
   virtual void stop_translation_timestep ();
-
 };
 
-
 Span_bar_engraver::Span_bar_engraver ()
 {
   spanbar_ =0;
 }
 
-
-
 void
 Span_bar_engraver::acknowledge_grob (Grob_info i)
 {
@@ -55,14 +51,14 @@ 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);
+         
        }
     }
 }
+
 void
 Span_bar_engraver::stop_translation_timestep ()
 {
@@ -73,22 +69,17 @@ Span_bar_engraver::stop_translation_timestep ()
 
       SCM vissym =ly_symbol2scm ("break-visibility");
       SCM vis = bars_[0]->internal_get_property (vissym);        
-      if (scm_equal_p (spanbar_->internal_get_property (vissym), vis) != SCM_BOOL_T)
+      if (ly_c_equal_p (spanbar_->internal_get_property (vissym), vis))
        spanbar_->internal_set_property (vissym, vis);
 
-      typeset_grob (spanbar_);
+      
       spanbar_ =0;
     }
   bars_.set_size (0);
 }
 
 
-
-
-
-
-
-ENTER_DESCRIPTION(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",