X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftfm.hh;h=47f79bcad998f6cb23cbc5c7d8d1c1e8698963c0;hb=2745cbd907f8216a4cc1fc5f488ae19efdfdbd10;hp=098fbe3e912c36410fd29ba7409cfd8e86428e86;hpb=9c8bcb9a2a1fedb5459e593b18a8c550318e6800;p=lilypond.git

diff --git a/lily/include/tfm.hh b/lily/include/tfm.hh
index 098fbe3e91..47f79bcad9 100644
--- a/lily/include/tfm.hh
+++ b/lily/include/tfm.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1999--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
   revamped code from GNU Fontutils-0.6
@@ -135,10 +135,10 @@ struct Tex_font_char_metric
   Char_code code_;
   Real width_, height_, depth_, italic_correction_;
   Fix width_fix_, height_fix_, depth_fix_, italic_correction_fix_;
-  Array<Tfm_kern> kern_arr_;
-  Array<Tfm_ligature> ligature_arr_;
+  Array<Tfm_kern> kerns_;
+  Array<Tfm_ligature> ligatures_;
 
-  String str () const;
+  String to_string () const;
   Tex_font_char_metric ();
 
   Box dimensions () const; 
@@ -150,18 +150,18 @@ class Tex_font_metric : public Font_metric
 public:
   static  SCM make_tfm (String filename);
 
-  Box get_char (int, bool) const;
+  virtual int count () const;
+  virtual Box get_char (int) const;
   Tex_font_char_metric const *find_ascii (int ascii, bool warn=true) const;
 
-  String str () const;
-
-private:
-  Tex_font_metric ();
+  String to_string () const;
   
   Tfm_info info_;
   Tfm_header header_;
   Array<Tex_font_char_metric> char_metrics_;
   Array<int> ascii_to_metric_idx_;
+private:
+  Tex_font_metric ();
 };