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 c53b5aebb4785467d061ad39f16b56f689933fbd..8e183f9d3417af0cd94c34114bbe35f2cffafa0b 100644 (file)
--- a/lily/axis-group-interface-scheme.cc
+++ b/lily/axis-group-interface-scheme.cc
@@ -1,29 +1,72 @@
 /*
-  axis-group-interface-scheme.cc -- implement Axis_group_interface bindings
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #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 = 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;
+  if (!ga)
+    {
+      for (SCM s = elements; scm_is_pair (s); s = scm_cdr (s))
+        elts.push_back (Grob::unsmob (scm_car (s)));
+    }
+
+  Interval ext = Axis_group_interface::relative_group_extent (ga ? ga->array () : elts,
+                                                              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::relative_group_extent (elements,
-                                                             unsmob_grob (common),
-                                                             (Axis) scm_to_int (axis));
+  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}.")
+{
+  LY_ASSERT_SMOB (Grob, grob, 1);
+  LY_ASSERT_SMOB (Grob, grob_element, 2);
+  Axis_group_interface::add_element (Grob::unsmob (grob), Grob::unsmob (grob_element));
+  return SCM_UNSPECIFIED;
+}