lilypond-0.0.20

diff --git a/hdr/beam.hh b/hdr/beam.hh
index 0032b67e172dd2711c90b1331ee65ecc628eb11c..e376f00978066da6a4a2c0d61709eee112ed1780 100644 (file)
--- a/hdr/beam.hh
+++ b/hdr/beam.hh
@@ -7,23 +7,23 @@
 #ifndef BEAM_HH
 #define BEAM_HH
 #include "proto.hh"
-#include "spanner.hh"
+#include "directionalspanner.hh"
 #include "plist.hh"
 
 /// a beam connects multiple stems 
-struct Beam: public Spanner {
+struct Beam:  public Directional_spanner {
     PointerList<Stem*> stems;
     Real slope;
     Real left_pos;
-    /// -1 below heads, +1 above heads.
-    int dir;   
+    /// dir: -1 below heads, +1 above heads.
+
 
     Rhythmic_grouping *group;
 
     /****************/
     
     virtual Interval width()const;    
-
+    Offset center() const;
     Spanner *broken_at(PCol *,  PCol *) const;
     Beam();
     void add(Stem*);

diff --git a/hdr/slur.hh b/hdr/slur.hh
index 10b588457174d17beb4bf0acfd68ecb94d641ac7..df144a88ee8ddd761efe5143337d7cd68ee56945 100644 (file)
--- a/hdr/slur.hh
+++ b/hdr/slur.hh
@@ -7,19 +7,20 @@
 #ifndef SLUR_HH
 #define SLUR_HH
 
-#include "spanner.hh"
+#include "directionalspanner.hh"
 #include "fproto.hh"
 #include "vray.hh"
 
-struct Slur : Spanner {
+struct Slur : Directional_spanner {
 
     svec<Notehead*> encompass;
-    int dir;
+    //int dir;
 
     bool open_left,open_right;                 
 
     /****************/
-
+    Offset center() const;
+    void calculate();
     void print()const;    
     void preprocess();
     void add(Notehead*);

diff --git a/src/misc.cc b/src/misc.cc
index ff99029ec72927268f8601ee7272493549841e70..5618f8ae2a2b766b5519274fe54fcdfcd3982dd4 100644 (file)
--- a/src/misc.cc
+++ b/src/misc.cc
@@ -1,17 +1,18 @@
 #include "misc.hh"
 #include "glob.hh"
+#include "moment.hh"
 
 #include <math.h>
 
-Real
+Moment
 wholes(int dur, int dots)
 {
     if (!dur)
        return 0.0;
 
     // stupid Intel: doesn't crash if !dur
-    Real f = 1.0/Real(dur);
-    Real delta = f;
+    Moment f = 1/Moment(dur);
+    Moment delta = f;
 
     while (dots--) {
        delta /= 2.0;