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

diff --git a/lily/template5.cc b/lily/template5.cc
index f325d0bdc2..35d15f0829 100644
--- a/lily/template5.cc
+++ b/lily/template5.cc
@@ -1,35 +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--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--1999 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 "proto.hh"
-#include "string.hh"
 #include "moment.hh"
 #include "real.hh"
+#include "interval.hh"
 
 #include "interval.tcc"
 
-#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 ();
 }
 
+template INTERVAL__INSTANTIATE (Rational);
 
+template<>
+Moment
+Interval_t<Moment>::infinity ()
+{
+  Moment infty;
+
+  infty.main_part_.set_infinite (1);
+  return infty;
+}
 
-template INTERVAL__INSTANTIATE(Rational);
+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);
+}