release: 1.5.29

[lilypond.git] / lily / scaled-font-metric.cc

diff --git a/lily/scaled-font-metric.cc b/lily/scaled-font-metric.cc
index 6b9be2b972793a49bc5d732f291a5e0ec3f72644..d911d26e2ba8948ee47b29c2d4ce1b655f507e0d 100644 (file)
--- a/lily/scaled-font-metric.cc
+++ b/lily/scaled-font-metric.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -17,8 +17,8 @@ Scaled_font_metric::Scaled_font_metric (Font_metric* m, Real magn)
   magnification_f_ = magn;
   SCM desc = m->description_;
 
-  Real total_mag = magn * gh_scm2double (gh_cdr (desc));
-  description_ = gh_cons (gh_car (desc), gh_double2scm (total_mag));
+  Real total_mag = magn * gh_scm2double (ly_cdr (desc));
+  description_ = gh_cons (ly_car (desc), gh_double2scm (total_mag));
   orig_l_ = m;
 }
 
@@ -35,7 +35,7 @@ Scaled_font_metric::find_by_name (String s) const
   Molecule m = orig_l_->find_by_name (s);
   Box b = m.extent_box ();
   b.scale (magnification_f_);
-  Molecule q(b,fontify_atom ((Font_metric*) this, m.get_expr ()));
+  Molecule q (b,fontify_atom ((Font_metric*) this, m.get_expr ()));
 
   return q ;
 }
@@ -56,3 +56,9 @@ Scaled_font_metric::text_dimension (String t) const
   b.scale (magnification_f_);
   return b;
 }
+
+int
+Scaled_font_metric::count () const
+{
+  return orig_l_->count ();
+}