From: David Kastrup <dak@gnu.org>
Date: Tue, 5 Nov 2013 20:15:08 +0000 (+0100)
Subject: Revert "Adds ly:generic-bound-extent function."
X-Git-Tag: release/2.17.96-1~28
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5dddf699fdeff5a2b116a1d5473714051189b050;p=lilypond.git

Revert "Adds ly:generic-bound-extent function."

This reverts commit 0b032b61be1224b2cce061df60aa89ea5aa89c07.
---

diff --git a/input/regression/bend-bound.ly b/input/regression/bend-bound.ly
deleted file mode 100644
index bceb10564e..0000000000
--- a/input/regression/bend-bound.ly
+++ /dev/null
@@ -1,23 +0,0 @@
-\version "2.17.30"
-
-\header {
-  texidoc = "Bends should not be effected by the full width of a
-@code{NonMusicalPaperColumn}. The bends should have identical X
-spans in the two examples.
-"
-}
-
-music = \repeat unfold 16 { c''4\bendAfter #-4 }
-sixteens = \repeat unfold 64 { c'16 }
-
-\new Score {
-  << \music \sixteens >>
-}
-
-\new Score \with {
-  currentBarNumber = #200
-  barNumberVisibility = #(every-nth-bar-number-visible 1)
-  \override BarNumber.break-visibility = #end-of-line-invisible
-} {
-  << \music \sixteens >>
-}
diff --git a/lily/axis-group-interface-scheme.cc b/lily/axis-group-interface-scheme.cc
index 68b3dd3746..69b7c82fdf 100644
--- a/lily/axis-group-interface-scheme.cc
+++ b/lily/axis-group-interface-scheme.cc
@@ -46,20 +46,6 @@ LY_DEFINE (ly_relative_group_extent, "ly:relative-group-extent",
   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"
diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 89d20b9550..02170918a1 100644
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -912,8 +912,8 @@ and duration-log @var{log}."
 
          (left-x (+ padding
                     (max
-                     (interval-end (ly:generic-bound-extent
-                                    left-span common))
+                     (interval-end (ly:grob-robust-relative-extent
+                                    left-span common X))
                      (if
                       (and dots
                            (close
@@ -923,7 +923,7 @@ and duration-log @var{log}."
                        (ly:grob-robust-relative-extent dots common X))
                       (- INFINITY-INT)))))
          (right-x (max (- (interval-start
-                           (ly:generic-bound-extent right-span common))
+                           (ly:grob-robust-relative-extent right-span common X))
                           padding)
                        (+ left-x minimum-length)))
          (self-x (ly:grob-relative-coordinate spanner common X))