release: 0.1.11

[lilypond.git] / lily / include / grouping.hh

diff --git a/lily/include/grouping.hh b/lily/include/grouping.hh
index e4395b1f7aed25416826cabd6078d4c28d1e6d6e..d88ed2876b5f0b8e9c4d3f7407b37818e6733d3e 100644 (file)
--- a/lily/include/grouping.hh
+++ b/lily/include/grouping.hh
@@ -1,5 +1,5 @@
 /*
-  grouping.hh -- part of LilyPond
+  grouping.hh -- part of GNU LilyPond
 
   (c) 1996,97 Han-Wen Nienhuys
 */
@@ -7,12 +7,9 @@
 #ifndef GROUPING_HH
 #define GROUPING_HH
 
-#include "moment.hh"
-#include "interval.hh"
+#include "minterval.hh"
 #include "varray.hh"
 
-typedef Interval_t<Moment> MInterval;
-
 /** data structure which represents rhythmic units   this is a tree. It groupes notes according to rules
 
   TODO Documentation. Unhairing
@@ -24,41 +21,41 @@ struct Rhythmic_grouping {
     /* *************** */
 
     Array<MInterval> intervals();
-    MInterval interval()const;
+    MInterval interval() const;
     Moment length() const;
-    void intersect(MInterval);
+    void intersect (MInterval);
     
     void operator=(Rhythmic_grouping const&);
-    Rhythmic_grouping(Rhythmic_grouping const&);
-    Rhythmic_grouping(MInterval, int n=1);
+    Rhythmic_grouping (Rhythmic_grouping const&);
+    Rhythmic_grouping (MInterval, int n=1);
     Rhythmic_grouping();
-    Rhythmic_grouping(Array<Rhythmic_grouping*>);
+    Rhythmic_grouping (Array<Rhythmic_grouping*>);
     ~Rhythmic_grouping();
 
-    void add_child(Moment start, Moment len);
-    bool child_fit_b(Moment start);
-    void split(Rhythmic_grouping r);
-    void split(Array<MInterval>);
-    void split(int n);
+    void add_child (Moment start, Moment len);
+    bool child_fit_b (Moment start);
+    void split (Rhythmic_grouping r);
+    void split (Array<MInterval>);
+    void split (int n);
 
     void print() const;
     void OK() const;
 
-    Array<int> generate_beams(Array<int>, int&);
+    Array<int> generate_beams (Array<int>, int&);
 
     /** multiply self to span #i#.
       In implementation, this isn't really const, but conceptually it is.
       */
-    void extend(MInterval i) const;
-    void translate(Moment);
+    void extend (MInterval i) const;
+    void translate (Moment);
 private:
     void init();
     void junk();
-    void copy(Rhythmic_grouping const&);
+    void copy (Rhythmic_grouping const&);
 };
 
 
-Rhythmic_grouping parse_grouping(Array<int> beat_i_arr, Array<Moment> elt_length_arr);
+Rhythmic_grouping parse_grouping (Array<int> beat_i_arr, Array<Moment> elt_length_arr);
 
 
 #endif