release: 1.3.74

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

diff --git a/lily/include/tfm-reader.hh b/lily/include/tfm-reader.hh
index 7d802d09a80f2c24dc9020bcc9f7e28cbe0443c8..53cb6d45ede5aa22e75c39c947ca22e20e0d607f 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 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
   revamped code from GNU Fontutils-0.6
@@ -18,12 +18,7 @@
 
 class Tex_font_metric_reader
 {
-public:
-  static Tex_font_metric * read_file (String name);
-  
 private:
-  Tex_font_metric_reader (Tex_font_metric *, String name);
-
   Real get_U32_fix_f ();
   Real get_U32_fix_scaled_f ();
   String get_bcpl_str ();
@@ -34,8 +29,17 @@ private:
   Tex_font_char_metric read_char ();
   void read_lig_kern_program (Array<Tfm_ligature>* ligature_arr_p, Array <Tfm_kern>* kern_arr_p);
 
-  Tex_font_metric *tfm_l_;
+
   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_;
 };