X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcluster.cc;h=b1e1f6aec106ccd336a7426f8c750978aaa746da;hb=c75617c60b8585fc27615de77b3add995adc9fee;hp=ac0abc9c74482b6709c773668d727fac2e0c9785;hpb=d61cf3bbdb1c6670a127ba3baddf2f04d3e34fd3;p=lilypond.git diff --git a/lily/cluster.cc b/lily/cluster.cc index ac0abc9c74..b1e1f6aec1 100644 --- a/lily/cluster.cc +++ b/lily/cluster.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2002--2012 Juergen Reuter + Copyright (C) 2002--2014 Juergen Reuter Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify @@ -125,7 +125,7 @@ MAKE_SCHEME_CALLBACK (Cluster, calc_cross_staff, 1); SCM Cluster::calc_cross_staff (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = Grob::unsmob (smob); extract_grob_set (me, "columns", cols); Grob *commony = common_refpoint_of_array (cols, me, Y_AXIS); @@ -137,7 +137,7 @@ MAKE_SCHEME_CALLBACK (Cluster, print, 1); SCM Cluster::print (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = Grob::unsmob (smob); Spanner *spanner = dynamic_cast (me); if (!spanner) @@ -235,7 +235,7 @@ MAKE_SCHEME_CALLBACK (Cluster_beacon, height, 1); SCM Cluster_beacon::height (SCM g) { - Grob *me = unsmob_grob (g); + Grob *me = Grob::unsmob (g); Interval v = robust_scm2interval (me->get_property ("positions"), Interval (0, 0)); return ly_interval2scm (Staff_symbol_referencer::staff_space (me) * 0.5 * v);