X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Finterval.hh;h=af277a33b43c84e9371ec86c43fa95bc236a837e;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=c485f32016a7e72304eb13016827ae5cb396c997;hpb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;p=lilypond.git

diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index c485f32016..af277a33b4 100644
--- 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--2006 Han-Wen Nienhuys
+  Copyright (C) 1996--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
+  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,13 +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 ();
 
-  /*
-    TODO: strip hungarian suffix.
-  */
+  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);
@@ -95,19 +110,15 @@ 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;
   }
 
-  Real linear_combination (Real x) const
-  {
-    Drul_array<Real> da (at (LEFT), at (RIGHT));
-    return ::linear_combination (da, x);
-  }
+  Real linear_combination (Real x) const;
   string to_string () const;
 
   bool contains (T r) const;
@@ -128,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];
   }
 };
 
@@ -217,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