* lily/skyline.cc (merge_skyline): new function

[lilypond.git] / lily / include / scaled-font-metric.hh

diff --git a/lily/include/scaled-font-metric.hh b/lily/include/scaled-font-metric.hh
index 0535df0fc2768560845071096b7d13e570935345..2383c7bb099f406ea1f1ff1a8cc6a37d053ef7cb 100644 (file)
--- a/lily/include/scaled-font-metric.hh
+++ b/lily/include/scaled-font-metric.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -20,11 +20,11 @@ struct Scaled_font_metric : public Font_metric
   virtual Box text_dimension (String) const;
   virtual Molecule find_by_name (String) const;
   static SCM make_scaled_font_metric (Font_metric*, Real);
-
+  virtual int count () const;
 protected:
   virtual   Box get_char (int)const;
-  Font_metric *orig_l_;
-  Real magnification_f_;
+  Font_metric *orig_;
+  Real magnification_;
   
   Scaled_font_metric (Font_metric*,Real);
 };