X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-interface-scheme.cc;h=ec89e8337cbda15e93de3deffa06d99c30a1cace;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=f15c4636abac01402ea4694b43576722488fef02;hpb=f51609af5239aa5024a8d8c0750e293384fd7381;p=lilypond.git diff --git a/lily/axis-group-interface-scheme.cc b/lily/axis-group-interface-scheme.cc index f15c4636ab..ec89e8337c 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--2010 Han-Wen Nienhuys + Copyright (C) 2005--2014 Han-Wen Nienhuys 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,9 +23,9 @@ #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); @@ -33,23 +33,37 @@ LY_DEFINE (ly_relative_group_extent, "ly:relative-group-extent", LY_ASSERT_SMOB (Grob, common, 2); LY_ASSERT_TYPE (is_axis, axis, 3); - vector elts; + vector 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 (unsmob_grob (scm_car (s))); } Interval ext = Axis_group_interface::relative_group_extent (ga ? ga->array () : elts, - unsmob_grob (common), - (Axis) scm_to_int (axis)); + unsmob_grob (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 (unsmob_grob (grob), unsmob_grob (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);