Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / duration.cc

diff --git a/lily/duration.cc b/lily/duration.cc
index 08a5bbb78c8e609b11713b1280a658bd60d43ec5..1618489027dd7d74c53c9e4952fb4a6b0fce4be3 100644 (file)
--- a/lily/duration.cc
+++ b/lily/duration.cc
@@ -3,8 +3,8 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
-  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "duration.hh"
@@ -47,7 +47,7 @@ Duration::get_length () const
 {
   Rational mom (1 << abs (durlog_));
 
-  if (durlog_> 0)
+  if (durlog_ > 0)
     mom = Rational (1) / mom;
 
   Rational delta = mom;
@@ -60,10 +60,10 @@ Duration::get_length () const
   return mom * factor_;
 }
 
-String
+string
 Duration::to_string () const
 {
-  String s;
+  string s;
 
   if (durlog_ < 0)
     s = "log = " + ::to_string (durlog_);
@@ -91,7 +91,7 @@ Duration::print_smob (SCM s, SCM port, scm_print_state *)
   Duration *r = (Duration *) SCM_CELL_WORD_1 (s);
 
   scm_puts ("#<Duration ", port);
-  scm_display (scm_makfrom0str (r->to_string ().to_str0 ()), port);
+  scm_display (ly_string2scm (r->to_string ()), port);
   scm_puts (" >", port);
 
   return 1;