2003 -> 2004

[lilypond.git] / lily / include / tfm.hh

diff --git a/lily/include/tfm.hh b/lily/include/tfm.hh
index 93deefc1066264f95cfee4073125da356bc21139..5869aca15950a77035f739091c7324b29b9a162e 100644 (file)
--- a/lily/include/tfm.hh
+++ b/lily/include/tfm.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2004 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,12 +150,11 @@ class Tex_font_metric : public Font_metric
 public:
   static  SCM make_tfm (String filename);
 
-  Box get_char (int) const;
+  virtual int count () const;
+  virtual Box get_ascii_char (int) const;
   Tex_font_char_metric const *find_ascii (int ascii, bool warn=true) const;
 
-  String str () const;
-
-
+  String to_string () const;
   
   Tfm_info info_;
   Tfm_header header_;