X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-interface-scheme.cc;h=154521ca4f66f974cee1ca225f5275943dadf524;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=a5e00341b97aa260f5051889f4abb7004e9e182c;hpb=e6caaa132f59006e5c47d0007b24bfedd07ad145;p=lilypond.git diff --git a/lily/axis-group-interface-scheme.cc b/lily/axis-group-interface-scheme.cc index a5e00341b9..154521ca4f 100644 --- a/lily/axis-group-interface-scheme.cc +++ b/lily/axis-group-interface-scheme.cc @@ -3,8 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2005 Han-Wen Nienhuys - + (c) 2005--2006 Han-Wen Nienhuys */ #include "axis-group-interface.hh" @@ -12,28 +11,27 @@ #include "grob.hh" #include "grob-array.hh" -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.") +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.") { 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"); + + 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"); Link_array elts; - if (!ga) + if (!ga) { for (SCM s = elements; scm_is_pair (s); s = scm_cdr (s)) elts.push (unsmob_grob (scm_car (s))); } - + Interval ext = Axis_group_interface::relative_group_extent (ga ? ga->array () : elts, unsmob_grob (common), (Axis) scm_to_int (axis)); return ly_interval2scm (ext); } - - +