* flower/include/axis.hh: rename from axes.hh

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

diff --git a/lily/include/tfm-reader.hh b/lily/include/tfm-reader.hh
index b1c15a3b95666c517a835527cbd0f3c8828f8a01..a42a5601e6da97aa12d507ec92e288d8a063e73a 100644 (file)
--- a/lily/include/tfm-reader.hh
+++ b/lily/include/tfm-reader.hh
@@ -1,14 +1,13 @@
-/*   
+/*
   tfm-reader.hh -- declare Tex_font_metric_reader
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
 
+  (c) 1999--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  revamped code from GNU Fontutils-0.6
 
- */
+  revamped code from GNU Fontutils-0.6
+*/
 
 #ifndef TFM_READER_HH
 #define TFM_READER_HH
@@ -18,25 +17,28 @@
 
 class Tex_font_metric_reader
 {
-public:
-  Tex_font_metric_reader (String name);
-  Tex_font_metric read_tfm ();
-  
 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);
 
-  Tex_font_metric tfm_;
   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 */