lilypond-1.3.0

diff --git a/flower/include/scalar.hh b/flower/include/scalar.hh
index b389277bc3bafcae8a49d056b51d1758e54e8a9e..1960e53d5614776bdddc2a66d5142bf8391c6c13 100644 (file)
--- 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 476b6485bdd3727609f224bbeb1b64e3dc1a43bd..48d4889a4eaed7f1a49fd917ebf604c121b10bb8 100644 (file)
--- 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 9953c7550d1efe5d1f94794529f02e5b628a5d64..6e35416a1896982813cdf3a32df6bb802decd76c 100644 (file)
--- 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 1000f37ab64312106fac2f49d46e7e96204cfb34..1181e03925052b1f0f3b374dac7c2f358cb150ef 100644 (file)
--- 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 719bf6dfbaec58f01063ce6f1e413baa3c17fc8a..93edfce560eef3ec73b9ba95943d18b7d1a63317 100644 (file)
--- 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 c8582e8abb8239819af9ecdeda4d3adcb29d231d..9e3b16d827cf03ec7565db98cdc067f556c6fa0e 100644 (file)
--- 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 75bbaa2ee29dbe9ca1c73479f4d6cda762f71f22..a4960abc7ba2bc32933626d4a73c91a77b84fb87 100644 (file)
--- 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"