* flower/include/std-string.hh:

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

diff --git a/lily/include/tfm-reader.hh b/lily/include/tfm-reader.hh
index a42a5601e6da97aa12d507ec92e288d8a063e73a..91433ad7af2297307f95ec5b49192627a5ccdc50 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--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
   revamped code from GNU Fontutils-0.6
@@ -20,24 +20,24 @@ class Tex_font_metric_reader
 private:
   Real get_U32_fix ();
   Real get_U32_fix_scaled ();
-  String get_bcpl_string ();
+  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> *ligatures,
-                             Array<Tfm_kern> *kerns);
+  void read_lig_kern_program (vector<Tfm_ligature> *ligatures,
+                             vector<Tfm_kern> *kerns);
 
   Binary_source_file input_;
 
 public:
-  Tex_font_metric_reader (String name);
+  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_;
+  vector<Tex_font_char_metric> char_metrics_;
+  vector<vsize> ascii_to_metric_idx_;
 };
 
 #endif /* TFM_READER_HH */