X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftemplate5.cc;h=b669abb8994ef59bdbc51216cff3752c293233cb;hb=cffa59c48b309a0b0ac67394fae3b4e566e155b5;hp=bffae6d08019ea74ec56c6caba297f00e467a10d;hpb=50802c7203c8e4a3eea1d7bf23064d60cd0d3ec7;p=lilypond.git

diff --git a/lily/template5.cc b/lily/template5.cc
index bffae6d080..b669abb899 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--2007 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"
 
-Interval__instantiate(Rational);
-Interval__instantiate(int);
+template<>
+Rational
+Interval_t<Rational>::infinity ()
+{
+  Rational infty;
+  infty.set_infinite (1);
+  return infty;
+}
 
-const Real INFTY_f = (Real)INT_MAX;
-#if defined AIX || defined _WIN32
-const Real INFTY = 1e8;	// ARGh. AIX sucks -- so does doze
-#else
-const Real INFTY = HUGE_VAL;
-#endif
 
-Rational
-Interval_t<Rational>::infinity()
+template<>
+string
+Interval_t<Rational>::T_to_string (Rational a)
 {
-/*
-  windhoze-suck-suck-suck-suck-suck-thank-you-cygnus
+  return a.to_string ();
+}
 
-  I get tired of all these incompatibilities. We'll just assume:
+template INTERVAL__INSTANTIATE (Rational);
 
-  that 2^31 is *Big*
 
- */
+template<>
+Moment
+Interval_t<Moment>::infinity ()
+{
+  Moment infty;
+  
+  infty.main_part_.set_infinite (1);
+  return infty;
+}
+
 
-    return Rational(INT_MAX);
+template<>
+string
+Interval_t<Moment>::T_to_string (Moment a)
+{
+  return a.to_string ();
 }
 
-int
-Interval_t<int>::infinity()
+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);
 }