(stop_translation_timestep): set

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

diff --git a/lily/include/tfm-reader.hh b/lily/include/tfm-reader.hh
index 569a2d06143f60058d0a0651475bd629d2f990a1..91433ad7af2297307f95ec5b49192627a5ccdc50 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--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 
+  (c) 1999--2006 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,26 +17,28 @@
 
 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 ();
+  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 (vector<Tfm_ligature> *ligatures,
+                             vector<Tfm_kern> *kerns);
 
-  Tex_font_metric *tfm_l_;
   Binary_source_file input_;
-};
 
+public:
+  Tex_font_metric_reader (string name);
+
+  Tfm_info info_;
+  Tfm_header header_;
+  vector<Tex_font_char_metric> char_metrics_;
+  vector<vsize> ascii_to_metric_idx_;
+};
 
 #endif /* TFM_READER_HH */