X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftemplate5.cc;h=681812f8cadc74c70ac6b6adb456088182a240e2;hb=a8c9e8a7ca320ab0df5fd32e717fd62cd7635ce6;hp=29bb496ff4aae017b578621880444650889f85d8;hpb=dbe2d4d495590abfa3829f93c99c2ae3a71841f3;p=lilypond.git

diff --git a/lily/template5.cc b/lily/template5.cc
index 29bb496ff4..681812f8ca 100644
--- a/lily/template5.cc
+++ b/lily/template5.cc
@@ -3,44 +3,59 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include <limits.h>
-#include "proto.hh"
-#include "string.hh"
 #include "moment.hh"
 #include "real.hh"
+#include "interval.hh"
 
 #include "interval.tcc"
 
-template INTERVAL__INSTANTIATE(Rational);
-template INTERVAL__INSTANTIATE(int);
-
-#include "compare.hh"
-
+template<>
 Rational
-Interval_t<Rational>::infinity()
+Interval_t<Rational>::infinity ()
 {
   Rational infty;
   infty.set_infinite (1);
   return infty;
 }
 
-String
-Interval_t<Rational>::T_to_str (Rational a)
+
+template<>
+string
+Interval_t<Rational>::T_to_string (Rational a)
 {
-  return a.str ();
+  return a.to_string ();
 }
 
-int
-Interval_t<int>::infinity()
+template INTERVAL__INSTANTIATE (Rational);
+
+
+template<>
+Moment
+Interval_t<Moment>::infinity ()
 {
-  return INT_MAX;
+  Moment infty;
+  
+  infty.main_part_.set_infinite (1);
+  return infty;
 }
 
-String
-Interval_t<int>::T_to_str (int i)
+
+template<>
+string
+Interval_t<Moment>::T_to_string (Moment a)
+{
+  return a.to_string ();
+}
+
+template INTERVAL__INSTANTIATE (Moment);
+
+template<>
+Real
+Interval_t<Real>::linear_combination (Real x) const
 {
-  return String (i);
+  Drul_array<Real> da (at (LEFT), at (RIGHT));
+  return ::linear_combination (da, x);
 }