X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftemplate5.cc;h=b669abb8994ef59bdbc51216cff3752c293233cb;hb=30e40dc89dd3718437e970123757435354ada338;hp=05b842473dd92c9d7007424ba4f7048e09be5193;hpb=d8018dfc750f1dee8e1ee78a5d5f51b06d4c8348;p=lilypond.git

diff --git a/lily/template5.cc b/lily/template5.cc
index 05b842473d..b669abb899 100644
--- a/lily/template5.cc
+++ b/lily/template5.cc
@@ -1,28 +1,61 @@
-#include <limits.h>
-#include "proto.hh"
-#include "string.hh"
+/*
+  template5.cc -- instantiate Intervals
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
 #include "moment.hh"
 #include "real.hh"
+#include "interval.hh"
 
 #include "interval.tcc"
 
-Interval__instantiate(Rational);
-Interval__instantiate(int);
+template<>
+Rational
+Interval_t<Rational>::infinity ()
+{
+  Rational infty;
+  infty.set_infinite (1);
+  return infty;
+}
 
-#ifdef AIX
-const Real INFTY = 1e8;	// ARGh. AIX sucks
-#else
-const Real INFTY = HUGE_VAL;
-#endif
 
-Rational
-Interval_t<Rational>::infinity()
+template<>
+string
+Interval_t<Rational>::T_to_string (Rational a)
 {
-    return INFTY;
+  return a.to_string ();
 }
 
-int
-Interval_t<int>::infinity()
+template INTERVAL__INSTANTIATE (Rational);
+
+
+template<>
+Moment
+Interval_t<Moment>::infinity ()
+{
+  Moment infty;
+  
+  infty.main_part_.set_infinite (1);
+  return infty;
+}
+
+
+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 INT_MAX;
+  Drul_array<Real> da (at (LEFT), at (RIGHT));
+  return ::linear_combination (da, x);
 }