X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner-scheme.cc;h=1d413439b455822828419d8a8ae11fefb314633e;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=d733996430778378bf2c3a9d136ca65b85f527ff;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git

diff --git a/lily/spanner-scheme.cc b/lily/spanner-scheme.cc
index d733996430..1d413439b4 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 <hanwen@lilypond.org>
-  
+  Copyright (C) 2007--2015 Han-Wen Nienhuys <hanwen@lilypond.org>
+
 
   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,24 +22,37 @@
 #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_SMOB (Spanner, spanner, 1);
+  LY_ASSERT_TYPE (is_direction, dir, 2);
+  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_SMOB (Spanner, spanner, 1);
   LY_ASSERT_TYPE (is_direction, dir, 2);
-  
-  return unsmob_spanner (spanner)->get_bound (to_dir (dir))->self_scm ();
+  LY_ASSERT_SMOB (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<Spanner *> (unsmob_grob (spanner));
+  LY_ASSERT_TYPE (unsmob<Spanner>, spanner, 1);
+  Spanner *me = unsmob<Spanner> (spanner);
 
   SCM s = SCM_EOL;
   for (vsize i = me->broken_intos_.size (); i--;)
@@ -48,10 +61,10 @@ 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);
+  Grob *me = unsmob<Grob> (g);
   bool b = dynamic_cast<Spanner *> (me);
 
   return ly_bool2scm (b);