Merge remote branch 'origin' into release/unstable

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

diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index 4a08e278137a10be63df24f957943f389e265327..be7074c242bec76dc2a599e4e9359e6ad9e73556 100644 (file)
--- 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--2011 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
@@ -68,11 +68,14 @@ 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
   {