Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / figured-bass-continuation.cc

diff --git a/lily/figured-bass-continuation.cc b/lily/figured-bass-continuation.cc
index ad94209b65b216a2db416c716967fe942cf33a97..2f97de6dac069d389ae0fd3362427138a7170d9c 100644 (file)
--- a/lily/figured-bass-continuation.cc
+++ b/lily/figured-bass-continuation.cc
@@ -3,12 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
 #include "line-interface.hh"
-#include "lily-guile.hh"
 #include "spanner.hh"
 #include "output-def.hh"
 #include "item.hh"
@@ -21,7 +20,7 @@
 
 struct Figured_bass_continuation
 {
-  static bool has_interface (Grob*);
+  DECLARE_GROB_INTERFACE();
   
 public:
   DECLARE_SCHEME_CALLBACK(print, (SCM));
@@ -34,7 +33,7 @@ Figured_bass_continuation::center_on_figures (SCM grob)
 {
   Spanner *me = dynamic_cast<Spanner*> (unsmob_grob (grob));
   extract_grob_set (me, "figures", figures);
-  if (figures.is_empty ())
+  if (figures.empty ())
     return scm_from_double (0.0);
   Grob *common = common_refpoint_of_array (figures, me, Y_AXIS);
 
@@ -51,7 +50,7 @@ Figured_bass_continuation::print (SCM grob)
   Spanner *me = dynamic_cast<Spanner*> (unsmob_grob (grob));
 
   Real thick =
-    me->layout ()->get_dimension (ly_symbol2scm ("linethickness"))
+    me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"))
     * robust_scm2double (me->get_property ("thickness"), 1);
   
   Interval spanned;
@@ -82,7 +81,6 @@ Figured_bass_continuation::print (SCM grob)
 }
 
 ADD_INTERFACE(Figured_bass_continuation,
-             "figured-bass-continuation-interface",
              "Simple extender line between bounds.",
              
              /* props */