X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffigured-bass-continuation.cc;h=fcfddb94e6f4654ff48e3624e99b2da618792208;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=c7018f622871807533fdd7cc2286da3b726f7fbc;hpb=9106e3bd374198c5457c35181ae1d66b3ec95236;p=lilypond.git diff --git a/lily/figured-bass-continuation.cc b/lily/figured-bass-continuation.cc index c7018f6228..fcfddb94e6 100644 --- 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 Han-Wen Nienhuys + (c) 2005--2008 Han-Wen Nienhuys */ #include "line-interface.hh" -#include "lily-guile.hh" #include "spanner.hh" #include "output-def.hh" #include "item.hh" @@ -21,11 +20,11 @@ struct Figured_bass_continuation { - static bool has_interface (Grob*); + DECLARE_GROB_INTERFACE (); public: - DECLARE_SCHEME_CALLBACK(print, (SCM)); - DECLARE_SCHEME_CALLBACK(center_on_figures, (SCM)); + DECLARE_SCHEME_CALLBACK (print, (SCM)); + DECLARE_SCHEME_CALLBACK (center_on_figures, (SCM)); }; MAKE_SCHEME_CALLBACK (Figured_bass_continuation, center_on_figures, 1); @@ -34,7 +33,7 @@ Figured_bass_continuation::center_on_figures (SCM grob) { Spanner *me = dynamic_cast (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 (unsmob_grob (grob)); Real thick = - me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")) + me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")) * robust_scm2double (me->get_property ("thickness"), 1); Interval spanned; @@ -81,11 +80,10 @@ Figured_bass_continuation::print (SCM grob) return extender.smobbed_copy (); } -ADD_INTERFACE(Figured_bass_continuation, - "figured-bass-continuation-interface", +ADD_INTERFACE (Figured_bass_continuation, "Simple extender line between bounds.", - /* props */ + /* properties */ "thickness " "padding " "figures "