lilypond-0.1.48

diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index d236759219e1f66887b988b4111cfb1739bda840..b0207e0556f61d3997e76d8c79e5b386cbb757e6 100644 (file)
--- a/flower/include/interval.hh
+++ b/flower/include/interval.hh
@@ -24,6 +24,7 @@ struct Interval_t {
   /* ************** */
     
   static T infinity() ;
+  static String T_to_str (T arg);
     
   T center() { return (left + right) / T(2);}
   void translate (T t) {

diff --git a/flower/include/interval.tcc b/flower/include/interval.tcc
index 88dc1a7016716b10d8de1710664d7522761297b1..01dbbb169592e16778b15f213faf8218a07ba4c7 100644 (file)
--- a/flower/include/interval.tcc
+++ b/flower/include/interval.tcc
@@ -120,7 +120,7 @@ Interval_t<T>::str() const
        return "[empty]";
   String s ("[");
  
-  return s + String (left) + String ("," ) + String (right ) + String ("]" );
+  return s + T_to_str (left) + String ("," ) + T_to_str (right ) + String ("]" );
 }
 
 template<class T>

diff --git a/flower/interval.cc b/flower/interval.cc
index 7d2c0098393d7d5c5e29c7a660dd094e172d20b8..d4ca0f40f470117ffcf12b847b734a84bffd1516 100644 (file)
--- a/flower/interval.cc
+++ b/flower/interval.cc
@@ -21,3 +21,9 @@ Interval_t<Real>::infinity()
 {
   return HUGE_VAL;
 }
+
+String
+Interval_t<Real>::T_to_str (Real r)
+{
+  return String (r);
+}

diff --git a/lily/score-column.cc b/lily/score-column.cc
index 2e045df7bef556ed5591f2418d0aa304b586cc48..fda759a2da5411d981e3b17df313e4a0c602d94e 100644 (file)
--- a/lily/score-column.cc
+++ b/lily/score-column.cc
@@ -47,8 +47,7 @@ Score_column::add_duration (Moment d)
   if (!d)
     {
       warning (_("Ignoring zero duration added to column at ")
-              + String (when_)
-              );
+              + when_.str ());
       return;
     }
   

diff --git a/lily/staff-sym-grav.cc b/lily/staff-sym-grav.cc
index d704518f8cc01e511c90df1fe372cdb0ab26a44a..6aab67dece77bedede5aad66926fbfeba04c4183 100644 (file)
--- a/lily/staff-sym-grav.cc
+++ b/lily/staff-sym-grav.cc
@@ -11,7 +11,6 @@
 #include "score.hh"
 #include "p-col.hh"
 
-const NO_LINES = 5;
 
 void
 Staff_sym_engraver::fill_staff_info (Staff_info&i)
@@ -32,7 +31,7 @@ Staff_sym_engraver::Staff_sym_engraver()
 void
 Staff_sym_engraver::do_creation_processing()
 {
-  span_p_ = new Staff_symbol (NO_LINES);
+  span_p_ = new Staff_symbol;
   span_p_->set_bounds(LEFT,get_staff_info().command_pcol_l ());
   announce_element (Score_elem_info (span_p_, 0));
 }
@@ -40,6 +39,12 @@ Staff_sym_engraver::do_creation_processing()
 void
 Staff_sym_engraver::do_removal_processing()
 {
+  Scalar l (get_property ("nolines"));
+  if (l.isnum_b ())
+    {
+      span_p_->no_lines_i_ = l;
+    }
+
   span_p_->set_bounds(RIGHT,get_staff_info().command_pcol_l ());
   typeset_element (span_p_);
   span_p_ =0;

diff --git a/lily/template5.cc b/lily/template5.cc
index d038d3d31c719206c0a6cbb16603fe96acaeeb69..4cfa4f0b70b798afd673b2c75a5d0e93b9a3deb0 100644 (file)
--- a/lily/template5.cc
+++ b/lily/template5.cc
@@ -20,7 +20,15 @@ template INTERVAL__INSTANTIATE(int);
 Rational
 Interval_t<Rational>::infinity()
 {
-  return Rational (INT_MAX);
+  Rational infty;
+  infty.set_infinite (1);
+  return infty;
+}
+
+String
+Interval_t<Rational>::T_to_str (Rational a)
+{
+  return a.str ();
 }
 
 int
@@ -28,3 +36,9 @@ Interval_t<int>::infinity()
 {
   return INT_MAX;
 }
+
+String
+Interval_t<int>::T_to_str (int i)
+{
+  return String (i);
+}

diff --git a/lily/warn.cc b/lily/warn.cc
index 0dcee118abee2a66f48a6505ca8f5c21a7d7ab36..86604d585341802bb2d1985cbd5ffe8d03a8d33f 100644 (file)
--- a/lily/warn.cc
+++ b/lily/warn.cc
@@ -25,7 +25,7 @@ ostream *mlog (&cerr);
 void
 error_t (String const & s, Moment const & r)
 {
-  String t_mom = String (trunc (r)) + String (r - Moment (trunc (r)));
+  String t_mom = r.truncated ().str () +  (r - r.truncated ()).str ();
   String e=s+ " (t = " +  t_mom + ")";
   error (e);
 }
@@ -33,6 +33,6 @@ error_t (String const & s, Moment const & r)
 void
 error_t (String const & s, Time_description const &t_tdes)
 {
-  String e=s+ " (at t=" + String (t_tdes.bars_i_) + ": " + String (t_tdes.whole_in_measure_) + ")\n";
+  String e=s+ " (at t=" +  String(t_tdes.bars_i_) + ": " +  (t_tdes.whole_in_measure_).str () + ")\n";
   error (e);
 }