X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-array-scheme.cc;h=877876328465821f67f1d6071762fe0a86eb204f;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=d99cb58a900b1e9fb1cb513530ffe32fef45a135;hpb=60fc32ec59fd97456218332612b87b821968da84;p=lilypond.git diff --git a/lily/grob-array-scheme.cc b/lily/grob-array-scheme.cc index d99cb58a90..8778763284 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--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify @@ -22,30 +22,39 @@ #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 ()); + Grob_array *me = unsmob (grob_arr); + 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); + Grob_array *me = unsmob (grob_arr); LY_ASSERT_SMOB (Grob_array, grob_arr, 1); LY_ASSERT_TYPE (scm_is_integer, index, 2); 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.") +{ + Grob_array *me = unsmob (grob_arr); + LY_ASSERT_SMOB (Grob_array, grob_arr, 1); + + return grob_array_to_list (me); +}