* lily/align-interface.cc (find_fixed_alignment_parent): new function.

[lilypond.git] / lily / template5.cc

diff --git a/lily/template5.cc b/lily/template5.cc
index 98b3dc89fd9d9f6a8babc8ace553044a49f29591..33d9b32f18be2aa2269f45af664408becb917929 100644 (file)
--- a/lily/template5.cc
+++ b/lily/template5.cc
@@ -3,23 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <limits.h>
-#include "proto.hh"
 #include "string.hh"
 #include "moment.hh"
 #include "real.hh"
-
 #include "interval.tcc"
-
-template INTERVAL__INSTANTIATE(Rational);
-
 #include "compare.hh"
 
 Rational
-Interval_t<Rational>::infinity()
+Interval_t<Rational>::infinity ()
 {
   Rational infty;
   infty.set_infinite (1);
@@ -27,8 +22,11 @@ Interval_t<Rational>::infinity()
 }
 
 String
-Interval_t<Rational>::T_to_str (Rational a)
+Interval_t<Rational>::T_to_string (Rational a)
 {
-  return a.str ();
+  return a.to_string ();
 }
 
+
+
+template INTERVAL__INSTANTIATE (Rational);