(enumerate_attachments): use stem_extent_

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

diff --git a/lily/include/tfm-reader.hh b/lily/include/tfm-reader.hh
index cb3955f96f15b7331a95388356b0a0b6bd09a10b..f7e80e35a48ee4948ca689af5f5b2b27e058b9ad 100644 (file)
--- a/lily/include/tfm-reader.hh
+++ b/lily/include/tfm-reader.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
   revamped code from GNU Fontutils-0.6
@@ -19,29 +19,27 @@
 class Tex_font_metric_reader
 {
 private:
-  Real get_U32_fix_f ();
-  Real get_U32_fix_scaled_f ();
-  String get_bcpl_str ();
+  Real get_U32_fix ();
+  Real get_U32_fix_scaled ();
+  String get_bcpl_string ();
   void read_header ();
   void read_params ();
   void read_char_metrics ();
   Tex_font_char_metric read_char_metric (Char_code code);
   Tex_font_char_metric read_char ();
-  void read_lig_kern_program (Array<Tfm_ligature>* ligature_arr_p, Array <Tfm_kern>* kern_arr_p);
-
+  void read_lig_kern_program (Array<Tfm_ligature>* ligatures,
+                             Array <Tfm_kern>* kerns);
 
   Binary_source_file input_;
 
 public:
   Tex_font_metric_reader ( String name);
 
-  
   Tfm_info info_;
   Tfm_header header_;
   Array<Tex_font_char_metric> char_metrics_;
   Array<int> ascii_to_metric_idx_;
 };
 
-
 #endif /* TFM_READER_HH */