From b09666e6b7e7f3b2777e828662d212c9c13f8455 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 19:26:59 +0000
Subject: [PATCH] lilypond-0.0.20

---
 hdr/beam.hh | 10 +++++-----
 hdr/slur.hh |  9 +++++----
 src/misc.cc |  7 ++++---
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/hdr/beam.hh b/hdr/beam.hh
index 0032b67e17..e376f00978 100644
--- 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 10b5884571..df144a88ee 100644
--- 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 ff99029ec7..5618f8ae2a 100644
--- 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;
-- 
2.39.5