Run `make grand-replace'.

[lilypond.git] / lily / axis-group-interface-scheme.cc

diff --git a/lily/axis-group-interface-scheme.cc b/lily/axis-group-interface-scheme.cc
index c53b5aebb4785467d061ad39f16b56f689933fbd..98f42744b1d07e749da4e34b05e84f45b890ea4f 100644 (file)
--- a/lily/axis-group-interface-scheme.cc
+++ b/lily/axis-group-interface-scheme.cc
@@ -3,27 +3,35 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "axis-group-interface.hh"
 #include "lily-guile.hh"
+#include "grob.hh"
+#include "grob-array.hh"
 
-LY_DEFINE(ly_relative_group_extent, "ly:relative-group-extent",
-         3, 0, 0, (SCM elements, SCM common, SCM axis),
-         "Determine the extent of @var{elements} relative to @var{common} in the "
-         "@var{axis} direction.")
+LY_DEFINE (ly_relative_group_extent, "ly:relative-group-extent",
+          3, 0, 0, (SCM elements, SCM common, SCM axis),
+          "Determine the extent of @var{elements} relative to @var{common} in the"
+          " @var{axis} direction.")
 {
-  SCM_ASSERT_TYPE(scm_is_pair (elements), elements, SCM_ARG1, __FUNCTION__, "list");
-  SCM_ASSERT_TYPE(unsmob_grob (common), common, SCM_ARG2, __FUNCTION__, "grob");
-  SCM_ASSERT_TYPE(is_axis (axis), axis, SCM_ARG3, __FUNCTION__, "axis");
+  Grob_array *ga = unsmob_grob_array (elements);
+
+  SCM_ASSERT_TYPE (ga || scm_is_pair (elements), elements, SCM_ARG1, __FUNCTION__, "list or Grob_array");
+  LY_ASSERT_SMOB (Grob, common, 2);
+  LY_ASSERT_TYPE (is_axis, axis, 3);
 
+  vector<Grob*> elts;
+  if (!ga)
+    {
+      for (SCM s = elements; scm_is_pair (s); s = scm_cdr (s))
+       elts.push_back (unsmob_grob (scm_car (s)));
+    }
 
-  Interval ext = Axis_group_interface::relative_group_extent (elements,
+  Interval ext = Axis_group_interface::relative_group_extent (ga ? ga->array () : elts,
                                                              unsmob_grob (common),
                                                              (Axis) scm_to_int (axis));
   return ly_interval2scm (ext);
 }
-         
-         
+