X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner-scheme.cc;h=f14c69c76f01763549cf0be8fa0ca9f6750886d9;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=d733996430778378bf2c3a9d136ca65b85f527ff;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git diff --git a/lily/spanner-scheme.cc b/lily/spanner-scheme.cc index d733996430..f14c69c76f 100644 --- a/lily/spanner-scheme.cc +++ b/lily/spanner-scheme.cc @@ -1,8 +1,8 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2007--2010 Han-Wen Nienhuys - + Copyright (C) 2007--2014 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,21 +22,34 @@ #include "item.hh" LY_DEFINE (ly_spanner_bound, "ly:spanner-bound", - 2, 0, 0, (SCM spanner, SCM dir), - "Get one of the bounds of @var{spanner}. @var{dir} is @code{-1}" - " for left, and @code{1} for right.") + 2, 0, 0, (SCM spanner, SCM dir), + "Get one of the bounds of @var{spanner}. @var{dir} is @w{@code{-1}}" + " for left, and @code{1} for right.") { 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 logical for this list? */ LY_DEFINE (ly_spanner_broken_into, "ly:spanner-broken-into", - 1, 0, 0, (SCM spanner), - "Return broken-into list for @var{spanner}.") + 1, 0, 0, (SCM spanner), + "Return broken-into list for @var{spanner}.") { LY_ASSERT_TYPE (unsmob_spanner, spanner, 1); Spanner *me = dynamic_cast (unsmob_grob (spanner)); @@ -48,8 +61,8 @@ LY_DEFINE (ly_spanner_broken_into, "ly:spanner-broken-into", } LY_DEFINE (ly_spanner_p, "ly:spanner?", - 1, 0, 0, (SCM g), - "Is @var{g} a spanner object?") + 1, 0, 0, (SCM g), + "Is @var{g} a spanner object?") { Grob *me = unsmob_grob (g); bool b = dynamic_cast (me);