X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-interface-scheme.cc;h=4741b3719cd2627801a581f46b2068160000c2cf;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=744bff13aacd0040c714cae2272a38581b563452;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git

diff --git a/lily/axis-group-interface-scheme.cc b/lily/axis-group-interface-scheme.cc
index 744bff13aa..4741b3719c 100644
--- a/lily/axis-group-interface-scheme.cc
+++ b/lily/axis-group-interface-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -23,36 +23,50 @@
 #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.")
+           3, 0, 0, (SCM elements, SCM common, SCM axis),
+           "Determine the extent of @var{elements} relative to @var{common} in the"
+           " @var{axis} direction.")
 {
-  Grob_array *ga = unsmob_grob_array (elements);
+  Grob_array *ga = Grob_array::unsmob (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;
+  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)));
+        elts.push_back (Grob::unsmob (scm_car (s)));
     }
 
   Interval ext = Axis_group_interface::relative_group_extent (ga ? ga->array () : elts,
-							      unsmob_grob (common),
-							      (Axis) scm_to_int (axis));
+                                                              Grob::unsmob (common),
+                                                              (Axis) scm_to_int (axis));
+  return ly_interval2scm (ext);
+}
+
+LY_DEFINE (ly_generic_bound_extent, "ly:generic-bound-extent",
+           2, 0, 0, (SCM grob, SCM common),
+           "Determine the extent of @var{grob} relative to @var{common} along"
+           " the X axis, finding its extent as a bound when it a has"
+           " @code{bound-alignment-interfaces} property list set and"
+           " otherwise the full extent.")
+{
+  LY_ASSERT_SMOB (Grob, grob, 1);
+  LY_ASSERT_SMOB (Grob, common, 2);
+
+  Interval ext = Axis_group_interface::generic_bound_extent (Grob::unsmob (grob), Grob::unsmob (common), X_AXIS);
   return ly_interval2scm (ext);
 }
 
 LY_DEFINE (ly_axis_group_interface__add_element, "ly:axis-group-interface::add-element",
-	   2, 0, 0, (SCM grob, SCM grob_element),
-	   "Set @var{grob} the parent of @var{grob-element} on all axes of"
-	   " @var{grob}.")
+           2, 0, 0, (SCM grob, SCM grob_element),
+           "Set @var{grob} the parent of @var{grob-element} on all axes of"
+           " @var{grob}.")
 {
   LY_ASSERT_SMOB (Grob, grob, 1);
   LY_ASSERT_SMOB (Grob, grob_element, 2);
-  Axis_group_interface::add_element (unsmob_grob (grob), unsmob_grob (grob_element));
+  Axis_group_interface::add_element (Grob::unsmob (grob), Grob::unsmob (grob_element));
   return SCM_UNSPECIFIED;
 }