Run grand replace for 2015.

[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 69b7c82fdf430dbcf8382e0ada7361b20892d2d9..8e183f9d3417af0cd94c34114bbe35f2cffafa0b 100644 (file)
--- 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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 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
@@ -27,7 +27,7 @@ LY_DEFINE (ly_relative_group_extent, "ly:relative-group-extent",
            "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);
@@ -37,15 +37,29 @@ LY_DEFINE (ly_relative_group_extent, "ly:relative-group-extent",
   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),
+                                                              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"
@@ -53,6 +67,6 @@ LY_DEFINE (ly_axis_group_interface__add_element, "ly:axis-group-interface::add-e
 {
   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;
 }