* Documentation/user/tutorial.itely: Revised (continued).

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

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index 0738451478e05603963c73c4513fc3c49bc716b1..15e7234259b7794f07d347cf29c847042faefd5e 100644 (file)
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -25,31 +25,26 @@
   */
 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)
 {
-  int depth = i.origin_transes (this).size ();
-  if (depth > 1
-      && Bar_line::has_interface (i.grob_))
+  int depth = i.origin_contexts (this).size ();
+  if (depth && Bar_line::has_interface (i.grob_))
     {
       Item * it = dynamic_cast<Item*> (i.grob_);
       bars_.push (it);
@@ -59,11 +54,11 @@ Span_bar_engraver::acknowledge_grob (Grob_info i)
          spanbar_ = make_item ("SpanBar");
 
          spanbar_->set_parent (bars_[0], X_AXIS);
-
          announce_grob (spanbar_, SCM_EOL);
        }
     }
 }
+
 void
 Span_bar_engraver::stop_translation_timestep ()
 {
@@ -73,9 +68,9 @@ Span_bar_engraver::stop_translation_timestep ()
        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);
+      SCM vis = bars_[0]->internal_get_property (vissym);        
+      if (gh_equal_p (spanbar_->internal_get_property (vissym), vis))
+       spanbar_->internal_set_property (vissym, vis);
 
       typeset_grob (spanbar_);
       spanbar_ =0;
@@ -84,12 +79,7 @@ Span_bar_engraver::stop_translation_timestep ()
 }
 
 
-
-
-
-
-
-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",