X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftemplate5.cc;h=8f9118aee6271ac3778d2aea9bea18c8f50cbc7f;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=e57925bf5b38a7057f9fa4a22cb67b21c468c4b7;hpb=5e98b3e282d175f1908dc3017412431f443642c1;p=lilypond.git

diff --git a/lily/template5.cc b/lily/template5.cc
index e57925bf5b..8f9118aee6 100644
--- a/lily/template5.cc
+++ b/lily/template5.cc
@@ -1,30 +1,69 @@
 /*
-  template5.cc -- instantiate Intervals
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#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()
+Interval_t<Rational>::infinity ()
+{
+  Rational infty;
+  infty.set_infinite (1);
+  return infty;
+}
+
+template<>
+string
+Interval_t<Rational>::T_to_string (Rational a)
 {
-    return Rational(INT_MAX);
+  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);
 }