X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-number.cc;h=2972942ee346169e681908f838fa31b618d4afd8;hb=2c0565b220430eaf35f0a577aa7735664abcbb3e;hp=7e1993ecb4bafbd2add1425799d5e83d69a1ee5c;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git diff --git a/lily/tuplet-number.cc b/lily/tuplet-number.cc index 7e1993ecb4..2972942ee3 100644 --- a/lily/tuplet-number.cc +++ b/lily/tuplet-number.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2005--2010 Han-Wen Nienhuys + Copyright (C) 2005--2011 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify @@ -31,14 +31,13 @@ struct Tuplet_number DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM)); DECLARE_GROB_INTERFACE (); }; - MAKE_SCHEME_CALLBACK (Tuplet_number, print, 1); -SCM +SCM Tuplet_number::print (SCM smob) { Spanner *me = unsmob_spanner (smob); - Spanner *tuplet = unsmob_spanner (me->get_object ("bracket")); + Spanner *tuplet = unsmob_spanner (me->get_object ("bracket")); if (!tuplet || !tuplet->is_live ()) { @@ -52,7 +51,7 @@ Tuplet_number::print (SCM smob) stc->align_to (X_AXIS, CENTER); stc->align_to (Y_AXIS, CENTER); - SCM cpoints = tuplet->get_property ("control-points"); + SCM cpoints = tuplet->get_property ("control-points"); Drul_array points; if (scm_is_pair (cpoints)) { @@ -64,7 +63,7 @@ Tuplet_number::print (SCM smob) programming_error ("wrong type for control-points"); } stc->translate ((points[RIGHT] + points[LEFT]) / 2); - + return stc_scm; } @@ -77,10 +76,11 @@ Tuplet_number::calc_cross_staff (SCM smob) } ADD_INTERFACE (Tuplet_number, - "The number for a bracket.", + "The number for a bracket.", - /* properties */ - "avoid-slur " // UGH. - "bracket " - ); + /* properties */ + "avoid-slur " // UGH. + "bracket " + "direction " + );