Run `make grand-replace'.

[lilypond.git] / lily / spanner-scheme.cc

diff --git a/lily/spanner-scheme.cc b/lily/spanner-scheme.cc
index e5a33e0c4b45976ffc7f50907c5a592b25872931..097bdf0290b6cd2717f452535db67388b7451b07 100644 (file)
--- a/lily/spanner-scheme.cc
+++ b/lily/spanner-scheme.cc
@@ -3,22 +3,22 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2007 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2007--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
 #include "spanner.hh"
 #include "item.hh"
 
-LY_DEFINE (ly_spanner_get_bound, "ly:spanner-bound",
+LY_DEFINE (ly_spanner_bound, "ly:spanner-bound",
           2, 0, 0, (SCM slur, SCM dir),
-          "Get one of the bounds of @var{spanner}. @var{dir} is @code{-1} "
-          "for left, and @code{1} for right.")
+          "Get one of the bounds of @var{slur}.  @var{dir} is @code{-1}"
+          " for left, and @code{1} for right.")
 {
-  Spanner *sl = dynamic_cast<Spanner *> (unsmob_grob (slur));
-  SCM_ASSERT_TYPE (sl, slur, SCM_ARG1, __FUNCTION__, "spanner grob");
-  SCM_ASSERT_TYPE (is_direction (dir), slur, SCM_ARG2, __FUNCTION__, "dir");
-  return sl->get_bound (to_dir (dir))->self_scm ();
+  LY_ASSERT_TYPE (unsmob_spanner, slur, 1);
+  LY_ASSERT_TYPE (is_direction, dir,2);
+  
+  return unsmob_spanner (slur)->get_bound (to_dir (dir))->self_scm ();
 }
 
 /* TODO: maybe we should return a vector -- random access is more
@@ -27,8 +27,8 @@ LY_DEFINE (ly_spanner_broken_into, "ly:spanner-broken-into",
           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));
-  SCM_ASSERT_TYPE (me, spanner, SCM_ARG1, __FUNCTION__, "spanner");
 
   SCM s = SCM_EOL;
   for (vsize i = me->broken_intos_.size (); i--;)
@@ -38,7 +38,7 @@ 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?")
+          "Is @var{g} a spanner object?")
 {
   Grob *me = unsmob_grob (g);
   bool b = dynamic_cast<Spanner *> (me);