X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftemplate5.cc;h=35d15f0829984ec44de92122d1e20fe5f115a501;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=19e75a3874916ff1874ebbd24f4cb620f1b8d181;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git

diff --git a/lily/template5.cc b/lily/template5.cc
index 19e75a3874..35d15f0829 100644
--- a/lily/template5.cc
+++ b/lily/template5.cc
@@ -1,18 +1,29 @@
 /*
-  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--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.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 "string.hh"
 #include "moment.hh"
 #include "real.hh"
+#include "interval.hh"
+
 #include "interval.tcc"
-#include "compare.hh"
 
+template<>
 Rational
 Interval_t<Rational>::infinity ()
 {
@@ -21,12 +32,38 @@ Interval_t<Rational>::infinity ()
   return infty;
 }
 
-String
+template<>
+string
 Interval_t<Rational>::T_to_string (Rational a)
 {
-  return a.string ();
+  return a.to_string ();
 }
 
+template INTERVAL__INSTANTIATE (Rational);
 
+template<>
+Moment
+Interval_t<Moment>::infinity ()
+{
+  Moment infty;
 
-template INTERVAL__INSTANTIATE (Rational);
+  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
+{
+  Drul_array<Real> da (at (LEFT), at (RIGHT));
+  return ::linear_combination (da, x);
+}