From 44c4fdf0760d384f84ff77ee31f42694bffac68b Mon Sep 17 00:00:00 2001 From: Neil Puttock Date: Mon, 26 Jul 2010 23:22:08 +0100 Subject: [PATCH] Allow spanner bounds to be set in scheme. * lily/spanner-scheme (ly_spanner_bound/ly_spanner_set_bound_x): only return spanner bound if it exists, otherwise return '(): if we want to set bounds, we may need to test whether a bound already exists add new exported function ly:spanner-set-bound! --- lily/spanner-scheme.cc | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/lily/spanner-scheme.cc b/lily/spanner-scheme.cc index d733996430..60fe032cda 100644 --- a/lily/spanner-scheme.cc +++ b/lily/spanner-scheme.cc @@ -28,8 +28,21 @@ LY_DEFINE (ly_spanner_bound, "ly:spanner-bound", { LY_ASSERT_TYPE (unsmob_spanner, spanner, 1); LY_ASSERT_TYPE (is_direction, dir, 2); - - return unsmob_spanner (spanner)->get_bound (to_dir (dir))->self_scm (); + Item *bound = unsmob_spanner (spanner)->get_bound (to_dir (dir)); + return bound ? bound->self_scm () : SCM_EOL; +} + +LY_DEFINE (ly_spanner_set_bound_x, "ly:spanner-set-bound!", + 3, 0, 0, (SCM spanner, SCM dir, SCM item), + "Set grob @var{item} as bound in direction @var{dir} for" + " @var{spanner}.") +{ + LY_ASSERT_TYPE (unsmob_spanner, spanner, 1); + LY_ASSERT_TYPE (is_direction, dir, 2); + LY_ASSERT_TYPE (unsmob_item, item, 3); + + unsmob_spanner (spanner)->set_bound (to_dir (dir), unsmob_item (item)); + return SCM_UNSPECIFIED; } /* TODO: maybe we should return a vector -- random access is more -- 2.39.2