(DECLARE_BASE_SMOBS): add methods

[lilypond.git] / lily / bar-line.cc

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index 7a90ebb7297e321d77d18ebb23fa793ee8927ad0..f8942db710777bf48c81b8c943134f7f0d7c2ae8 100644 (file)
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -26,7 +26,7 @@ Bar_line::print (SCM smob)
 
   SCM s = me->get_property ("glyph");
   SCM barsiz_proc = me->get_property ("bar-size-procedure");
-  if (scm_is_string (s) && ly_c_procedure_p (barsiz_proc))
+  if (scm_is_string (s) && ly_is_procedure (barsiz_proc))
     {
       String str = ly_scm2string (s);
       SCM siz = scm_call_1 (barsiz_proc, me->self_scm ());
@@ -34,7 +34,7 @@ Bar_line::print (SCM smob)
       if (sz <= 0)
        return SCM_EOL;
 
-      return compound_barline (me, str, sz, true).smobbed_copy ();
+      return compound_barline (me, str, sz, false).smobbed_copy ();
     }
   return SCM_EOL;
 }
@@ -180,7 +180,7 @@ Bar_line::before_line_breaking (SCM smob)
       // leave y_extent for spanbar? 
     }
 
-  if (! ly_c_equal_p (g, orig))
+  if (! ly_is_equal (g, orig))
     me->set_property ("glyph", g);
 
   return SCM_UNSPECIFIED;