release commit

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

diff --git a/lily/scaled-font-metric.cc b/lily/scaled-font-metric.cc
index 27f8c34fc37deb852728888ee6d8ada6db0d91df..8583887b5855aa225ad2ae78ada741f371b15531 100644 (file)
--- a/lily/scaled-font-metric.cc
+++ b/lily/scaled-font-metric.cc
@@ -1,16 +1,27 @@
-#include "font-metric.hh"
+/*   
+     scaled-font-metric.cc -- declare Scaled_font_metric
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  
+ */
+
+#include "scaled-font-metric.hh"
 #include "string.hh"
 #include "molecule.hh"
 
 
 Scaled_font_metric::Scaled_font_metric (Font_metric* m, Real magn)
 {
-  magnification_f_ = magn;
+  magnification_ = magn;
   SCM desc = m->description_;
 
-  Real total_mag = magn * gh_scm2double (gh_cdr (desc));
-  description_ = gh_cons (gh_car (desc), gh_double2scm (total_mag));
-  orig_l_ = m;
+  Real total_mag = magn * gh_scm2double (ly_cdr (desc));
+  assert (total_mag);
+  
+  description_ = gh_cons (ly_car (desc), gh_double2scm (total_mag));
+  orig_ = m;
 }
 
 SCM
@@ -23,10 +34,33 @@ Scaled_font_metric::make_scaled_font_metric (Font_metric*m, Real s)
 Molecule
 Scaled_font_metric::find_by_name (String s) const
 {
-  Molecule m = orig_l_->find_by_name (s);
+  Molecule m = orig_->find_by_name (s);
   Box b = m.extent_box ();
-  b.scale (magnification_f_);
-  Molecule q(b,fontify_atom ((Font_metric*) this, m.get_expr ()));
+  b.scale (magnification_);
+  Molecule q (b,fontify_atom ((Font_metric*) this, m.get_expr ()));
 
   return q ;
 }
+
+Box 
+Scaled_font_metric::get_char (int i) const
+{
+  Box b = orig_->get_char (i);
+  b.scale (magnification_);
+  return b;  
+}
+
+Box
+Scaled_font_metric::text_dimension (String t) const
+{
+  Box b (orig_->text_dimension (t));
+
+  b.scale (magnification_);
+  return b;
+}
+
+int
+Scaled_font_metric::count () const
+{
+  return orig_->count ();
+}