X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-interface-scheme.cc;h=45236e6ca5a889efa7e05267315c99be7a4ff53f;hb=56cb2f30d1da32759b82a7820fd0d32e368bc973;hp=154521ca4f66f974cee1ca225f5275943dadf524;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git diff --git a/lily/axis-group-interface-scheme.cc b/lily/axis-group-interface-scheme.cc index 154521ca4f..45236e6ca5 100644 --- a/lily/axis-group-interface-scheme.cc +++ b/lily/axis-group-interface-scheme.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2005--2006 Han-Wen Nienhuys + (c) 2005--2007 Han-Wen Nienhuys */ #include "axis-group-interface.hh" @@ -13,20 +13,20 @@ LY_DEFINE (ly_relative_group_extent, "ly:relative-group-extent", 3, 0, 0, (SCM elements, SCM common, SCM axis), - "Determine the extent of @var{elements} relative to @var{common} in the " - "@var{axis} direction.") + "Determine the extent of @var{elements} relative to @var{common} in the" + " @var{axis} direction.") { Grob_array *ga = unsmob_grob_array (elements); SCM_ASSERT_TYPE (ga || scm_is_pair (elements), elements, SCM_ARG1, __FUNCTION__, "list or Grob_array"); - SCM_ASSERT_TYPE (unsmob_grob (common), common, SCM_ARG2, __FUNCTION__, "grob"); - SCM_ASSERT_TYPE (is_axis (axis), axis, SCM_ARG3, __FUNCTION__, "axis"); + LY_ASSERT_SMOB (Grob, common, 2); + LY_ASSERT_TYPE (is_axis, axis, 3); - Link_array elts; + vector elts; if (!ga) { for (SCM s = elements; scm_is_pair (s); s = scm_cdr (s)) - elts.push (unsmob_grob (scm_car (s))); + elts.push_back (unsmob_grob (scm_car (s))); } Interval ext = Axis_group_interface::relative_group_extent (ga ? ga->array () : elts,