X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-array-scheme.cc;h=2268ab6edaddbd28a72bcf9dde1a3e042306a3e2;hb=548a2fc5b2407c370d95c3cc1bd423c3d01fab76;hp=7518d2e2f5bc56c87c123f272c8dd2cbddd7ac52;hpb=95a4237d0aca94993bd3b91afc4ff0e4e2daec9f;p=lilypond.git diff --git a/lily/grob-array-scheme.cc b/lily/grob-array-scheme.cc index 7518d2e2f5..2268ab6eda 100644 --- a/lily/grob-array-scheme.cc +++ b/lily/grob-array-scheme.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--2012 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify @@ -22,21 +22,20 @@ #include "grob.hh" LY_DEFINE (ly_grob_array_length, "ly:grob-array-length", - 1, 0, 0, - (SCM grob_arr), - "Return the length of @var{grob-arr}.") + 1, 0, 0, + (SCM grob_arr), + "Return the length of @var{grob-arr}.") { LY_ASSERT_SMOB (Grob_array, grob_arr, 1); Grob_array *me = unsmob_grob_array (grob_arr); - return scm_from_int (me->size ()); + return scm_from_int (me->size ()); } - LY_DEFINE (ly_grob_array_ref, "ly:grob-array-ref", - 2, 0, 0, - (SCM grob_arr, SCM index), - "Retrieve the @var{index}th element of @var{grob-arr}.") + 2, 0, 0, + (SCM grob_arr, SCM index), + "Retrieve the @var{index}th element of @var{grob-arr}.") { Grob_array *me = unsmob_grob_array (grob_arr); LY_ASSERT_SMOB (Grob_array, grob_arr, 1); @@ -44,15 +43,15 @@ LY_DEFINE (ly_grob_array_ref, "ly:grob-array-ref", vsize i = scm_to_uint (index); if (i == VPOS || i >= me->size ()) - scm_out_of_range (NULL, scm_from_unsigned_integer (i)); - + scm_out_of_range (NULL, scm_from_unsigned_integer (i)); + return me->grob (i)->self_scm (); } LY_DEFINE (ly_grob_array_2_list, "ly:grob-array->list", - 1, 0, 0, - (SCM grob_arr), - "Return the elements of @var{grob-arr} as a Scheme list.") + 1, 0, 0, + (SCM grob_arr), + "Return the elements of @var{grob-arr} as a Scheme list.") { Grob_array *me = unsmob_grob_array (grob_arr); LY_ASSERT_SMOB (Grob_array, grob_arr, 1);