From 1b510cdae09394b7d048c78307346f6dc2b668d8 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 26 Mar 2002 22:42:29 +0000
Subject: [PATCH] lilypond-1.3.0

---
 flower/include/scalar.hh | 19 +++++++++++--------
 flower/scalar.cc         |  4 +++-
 lily/local-key-item.cc   |  2 +-
 lily/lookup.cc           |  2 +-
 lily/ly-symbols.cc       |  1 +
 lily/slur.cc             |  8 ++++----
 lily/time-signature.cc   |  2 +-
 7 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/flower/include/scalar.hh b/flower/include/scalar.hh
index b389277bc3..1960e53d56 100644
--- a/flower/include/scalar.hh
+++ b/flower/include/scalar.hh
@@ -13,18 +13,21 @@
 #include "string.hh"
 #include "real.hh"
 
+#error
 /// Perl -like scalar type.
-struct Scalar : public String 
+struct Scalar 
 {
-  Scalar (Real r) { *this = to_str (r); }
-  Scalar (int i) { *this = to_str (i); }
-  Scalar (long l) { *this = to_str (l); }
-  Scalar (char c) { *this = to_str (c); }
-  Scalar (char const *c) : String (c) {}    
-  Scalar (String s) : String (s) {}
+  Protected_scm scm_;
+public:
+  Scalar (Real r);
+  Scalar (int i);
+  Scalar (long l);
+  Scalar (char c);
+  Scalar (char const *c);
+  Scalar (String s);
   Scalar (Rational);
   operator Rational();
-  Scalar() {}
+  Scalar();
   bool isnum_b() const;
   bool isdir_b() const;
   bool isint_b() const;
diff --git a/flower/scalar.cc b/flower/scalar.cc
index 476b6485bd..48d4889a4e 100644
--- a/flower/scalar.cc
+++ b/flower/scalar.cc
@@ -1,3 +1,4 @@
+#if 0
 /*
   scalar.cc -- implement Scalar
 
@@ -8,7 +9,7 @@
 
 #include <assert.h>
 #include <stdio.h>
-#include "scalar.hh"
+
 #include "rational.hh"
 
 Scalar::Scalar (Rational r)
@@ -105,3 +106,4 @@ Scalar::to_bool () const
 }
 
 
+#endif
diff --git a/lily/local-key-item.cc b/lily/local-key-item.cc
index 9953c7550d..6e35416a18 100644
--- a/lily/local-key-item.cc
+++ b/lily/local-key-item.cc
@@ -7,7 +7,7 @@
 */
 #include "local-key-item.hh"
 #include "molecule.hh"
-#include "scalar.hh"
+
 #include "lookup.hh"
 #include "paper-def.hh"
 #include "musical-request.hh"
diff --git a/lily/lookup.cc b/lily/lookup.cc
index 1000f37ab6..1181e03925 100644
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -15,7 +15,7 @@
 #include "lookup.hh"
 #include "debug.hh"
 #include "dimensions.hh"
-#include "scalar.hh"
+
 #include "paper-def.hh"
 #include "string-convert.hh"
 #include "file-path.hh"
diff --git a/lily/ly-symbols.cc b/lily/ly-symbols.cc
index 719bf6dfba..93edfce560 100644
--- a/lily/ly-symbols.cc
+++ b/lily/ly-symbols.cc
@@ -29,3 +29,4 @@ init_symbols ()
 }
 
 
+ADD_SCM_INIT_FUNC(lysyms, init_symbols);
diff --git a/lily/slur.cc b/lily/slur.cc
index c8582e8abb..9e3b16d827 100644
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -14,7 +14,7 @@
  */
 
 #include "slur.hh"
-#include "scalar.hh"
+
 #include "lookup.hh"
 #include "paper-def.hh"
 #include "note-column.hh"
@@ -243,11 +243,11 @@ Slur::do_post_processing ()
     }
   while (flip (&d) != LEFT);
 
-  bool cross_count =  cross_staff_count ();
+  int cross_count =  cross_staff_count ();
   bool interstaff_b = (0 < cross_count) && (cross_count < encompass_arr_.size ());
 
   Drul_array<Offset> info_drul;
-  Interval interstaff_interval;
+  Drul_array<Real> interstaff_interval;
 
   do
     {
@@ -257,7 +257,7 @@ Slur::do_post_processing ()
     }
   while (flip (&d) != LEFT);
   
-  Real interstaff_f = interstaff_interval.length ();
+  Real interstaff_f = interstaff_interval[RIGHT] - interstaff_interval[LEFT];
 
   if (fix_broken_b)
     {
diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 75bbaa2ee2..a4960abc7b 100644
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -7,7 +7,7 @@
   
  */
 
-#include "scalar.hh"
+
 #include "molecule.hh"
 #include "time-signature.hh"
 #include "paper-def.hh"
-- 
2.39.5