Doc: NR - Pitches.itely - dodecaphonic-no-repeat text alt

[lilypond.git] / lily / skyline-pair.cc

diff --git a/lily/skyline-pair.cc b/lily/skyline-pair.cc
index 6175d1e27580655aca34bae9ec9d8acaebddbe3f..d6bd5fb6fe085b475352c19c2f35d12e46558773 100644 (file)
--- a/lily/skyline-pair.cc
+++ b/lily/skyline-pair.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2008--2012 Han-Wen Nienhuys <hanwen@lilypond.org>
+  Copyright (C) 2008--2014 Han-Wen Nienhuys <hanwen@lilypond.org>
 
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -76,52 +76,6 @@ Skyline_pair::insert (Box const &b, Axis a)
   skylines_[DOWN].insert (b, a);
 }
 
-Real
-Skyline_pair::left () const
-{
-  return min (skylines_[UP].left (), skylines_[DOWN].left ());
-}
-
-Real
-Skyline_pair::right () const
-{
-  return max (skylines_[UP].right (), skylines_[DOWN].right ());
-}
-
-// This function comes with the same caveats as smallest_shift:
-// if the skylines are not contiguous, we may report false
-// intersections.
-bool
-Skyline_pair::intersects (Skyline_pair const &other) const
-{
-  return skylines_[UP].distance (other[DOWN]) > 0
-         && other[UP].distance (skylines_[DOWN]) > 0;
-}
-
-Real
-Skyline_pair::smallest_shift (Skyline_pair const &other, Direction d,
-                              Real h_pad, Real v_pad)
-{
-  // If skylines_[UP] avoids other[DOWN] or skylines_[DOWN] avoids
-  // other[UP] then we will not intersect.
-  // Note that this is not guaranteed to return the smallest shift
-  // if one Skyline_pair is not connected: the smallest_shift left
-  // in the case of
-  // AAA
-  // BBBBBB
-  //    AAA
-  // will result in
-  //    AAA
-  // BBBBBB
-  //       AAA
-  // even though the originals did not collide.  If it becomes necessary,
-  // this case could be handled by splitting the Skyline_pairs up into
-  // their connected components.
-
-  return d * min (d * skylines_[UP].smallest_shift (other[DOWN], d, h_pad, v_pad),
-                  d * skylines_[DOWN].smallest_shift (other[UP], d, h_pad, v_pad));
-}
-
 void
 Skyline_pair::merge (Skyline_pair const &other)
 {
@@ -136,6 +90,18 @@ Skyline_pair::print () const
   skylines_[DOWN].print ();
 }
 
+Real
+Skyline_pair::left () const
+{
+  return min (skylines_[UP].left (), skylines_[DOWN].left ());
+}
+
+Real
+Skyline_pair::right () const
+{
+  return max (skylines_[UP].right (), skylines_[DOWN].right ());
+}
+
 void
 Skyline_pair::print_points () const
 {
@@ -150,13 +116,6 @@ Skyline_pair::is_empty () const
          && skylines_[DOWN].is_empty ();
 }
 
-bool
-Skyline_pair::is_singleton () const
-{
-  return skylines_[UP].is_singleton ()
-         && skylines_[DOWN].is_singleton ();
-}
-
 Skyline &
 Skyline_pair::operator [] (Direction d)
 {