X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar-engraver.cc;h=80339b3ce8f6ff493fd4d6df62ffa7e319ca47b3;hb=6eced6a93bbfda6e6af37a7d77a8e75a5052dbee;hp=d45a1aaf3bcbc08610748414b6126b2f70eb3ff4;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index d45a1aaf3b..80339b3ce8 100644
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -1,5 +1,5 @@
 /*
-  span-bar-grav.cc -- implement Span_bar_engraver
+  span-bar-engraver.cc -- implement Span_bar_engraver
 
   source file of the GNU LilyPond music typesetter
 
@@ -11,15 +11,14 @@
 #include "span-bar.hh"
 #include "engraver.hh"
 
-/** 
+/**
 
-  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.
-
-  */
+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
 {
   Item *spanbar_;
@@ -41,17 +40,16 @@ void
 Span_bar_engraver::acknowledge_grob (Grob_info i)
 {
   int depth = i.origin_contexts (this).size ();
-  if (depth && Bar_line::has_interface (i.grob_))
+  if (depth && Bar_line::has_interface (i.grob ()))
     {
-      Item * it = dynamic_cast<Item*> (i.grob_);
+      Item *it = dynamic_cast<Item *> (i.grob ());
       bars_.push (it);
 
-      if (bars_.size () >= 2 && !spanbar_) 
+      if (bars_.size () >= 2 && !spanbar_)
 	{
 	  spanbar_ = make_item ("SpanBar", SCM_EOL);
 
 	  spanbar_->set_parent (bars_[0], X_AXIS);
-	  
 	}
     }
 }
@@ -59,28 +57,26 @@ Span_bar_engraver::acknowledge_grob (Grob_info i)
 void
 Span_bar_engraver::stop_translation_timestep ()
 {
-  if (spanbar_) 
+  if (spanbar_)
     {
-      for (int i = 0; i < bars_.size () ; i++)
-	Span_bar::add_bar (spanbar_,bars_[i]);
+      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_property (vissym);	  
-      if (ly_c_equal_p (spanbar_->internal_get_property (vissym), vis))
+      SCM vis = bars_[0]->internal_get_property (vissym);
+      if (ly_is_equal (spanbar_->internal_get_property (vissym), vis))
 	spanbar_->internal_set_property (vissym, vis);
 
-      
       spanbar_ = 0;
     }
   bars_.set_size (0);
 }
 
-
 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",
-/* accepts */     "",
-/* acks  */      "bar-line-interface",
-/* reads */       "",
-/* write */       "");
+		/* 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 */ "");