Run grand replace for 2015.

[lilypond.git] / flower / include / interval.hh

diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index 9808bfaef652768c93d8bb97dd0b1f02716fd030..8160b37c2ca4b943cca8cbd4805642e3e0ca462a 100644 (file)
--- a/flower/include/interval.hh
+++ b/flower/include/interval.hh
@@ -1,7 +1,20 @@
 /*
-  interval.hh -- part of flowerlib
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996--2008 Han-Wen Nienhuys
+  Copyright (C) 1996--2015 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
+  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/>.
 */
 
 #ifndef INTERVAL_HH
@@ -14,11 +27,11 @@
 
 /* A T interval.  This represents the closed interval [left,right].
    No invariants.  T must be a totally ordered ring (with division, anyway ..)
-   At instantiation, the function infinity () has to be defined explicitely. */
+   At instantiation, the function infinity () has to be defined explicitly. */
 template<class T>
 struct Interval_t : public Drul_array<T>
 {
-  Drul_array<T>::at;
+  using Drul_array<T>::at;
 
   static T infinity ();
   static string T_to_string (T arg);
@@ -55,10 +68,15 @@ struct Interval_t : public Drul_array<T>
     at (RIGHT) = max (at (RIGHT), p);
   }
   T length () const;
+
+  // Returns RIGHT - LEFT, even if the interval is empty.
   T delta () const;
   void set_empty ();
   void set_full ();
 
+  void unite_disjoint (Interval_t<T> h, T padding, Direction d);
+  Interval_t<T> union_disjoint (Interval_t<T> h, T padding, Direction d) const;
+
   bool is_empty () const
   {
     return at (LEFT) > at (RIGHT);
@@ -92,10 +110,10 @@ struct Interval_t : public Drul_array<T>
   {
     if (!is_empty ())
       {
-       at (LEFT) *= r;
-       at (RIGHT) *= r;
-       if (r < T (0))
-         swap ();
+        at (LEFT) *= r;
+        at (RIGHT) *= r;
+        if (r < T (0))
+          swap ();
       }
     return *this;
   }
@@ -121,7 +139,7 @@ struct Interval_t : public Drul_array<T>
 
   static bool left_less (Interval_t<T> const &a, Interval_t<T> const &b)
   {
-    return a[LEFT] < b[RIGHT];
+    return a[LEFT] < b[LEFT];
   }
 };
 
@@ -210,7 +228,7 @@ Interval_t<T>::center () const
 }
 
 typedef Interval_t<Real> Interval;
-typedef Interval_t<int> Slice; // weird name
+typedef Interval_t<int> Slice;  // weird name
 
 
 #endif // INTERVAL_HH