X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Finterval.hh;h=88cd01f89f8342a2d478ce39a6f2b6b4d8812d90;hb=77267b700c377fd170abcbf4863728937038eb5e;hp=b3a799d07497f2a682957e39a6fbd17f69414ad7;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index b3a799d074..88cd01f89f 100644
--- a/flower/include/interval.hh
+++ b/flower/include/interval.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2010 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
@@ -23,6 +23,7 @@
 #include <math.h>
 
 #include "flower-proto.hh"
+#include "std-string.hh"
 #include "drul-array.hh"
 
 /* A T interval.  This represents the closed interval [left,right].
@@ -31,7 +32,7 @@
 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);
@@ -68,10 +69,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);
@@ -105,10 +111,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;
   }
@@ -223,7 +229,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